- Committer: Martin Pool
- Date: 2005-11-17 03:49:30 UTC
- mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- Revision ID: mbp@sourcefrog.net-20051117034930-68148f4f6ee985e8
Give a warning, not exception, when trying to merge
x-bit against deletion.
Workaround for #4558
x-bit against deletion.
Workaround for #4558
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
plugins
|
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
selftest
|
723 | 19 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
|
store
|
1185.11.1 | 19 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
transport
|
1185.11.1 | 19 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
util
|
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
__init__.py |
1185.16.144 | 19 years ago | Martin Pool | Bump version to 0.7pre | 3.1 KB |
|
|
|
add.py |
1497 | 19 years ago | Robert Collins | Move Branch.read_working_inventory to WorkingTree. | 5.5 KB |
|
|
|
annotate.py |
1185.33.10 | 19 years ago | Martin Pool | Remove dead code | 3 KB |
|
|
|
atomicfile.py |
1185.12.80 | 19 years ago | Aaron Bentley | Added mode preservation to AtomicFile | 2.9 KB |
|
|
|
branch.py |
1185.33.17 | 19 years ago | Martin Pool | [merge] aaron, various fixes | 55.4 KB |
|
|
|
builtins.py |
1185.33.17 | 19 years ago | Martin Pool | [merge] aaron, various fixes | 63.1 KB |
|
|
|
changeset.py |
1185.33.26 | 19 years ago | Martin Pool | Give a warning, not exception, when trying to merg | 54.6 KB |
|
|
|
check.py |
1185.16.101 | 19 years ago | mbp at sourcefrog | todo | 7.7 KB |
|
|
|
clone.py |
1185.16.103 | 19 years ago | mbp at sourcefrog | Fix up all calls to InvalidRevisionId() to specify | 6.3 KB |
|
|
|
commands.py |
1185.33.20 | 19 years ago | Martin Pool | Really enter the debugger on failure | 17.7 KB |
|
|
|
commit.py |
1185.35.15 | 19 years ago | Aaron Bentley | Added branch nicks to revisions | 17.8 KB |
|
|
|
config.py |
1185.35.27 | 19 years ago | Aaron Bentley | Got unicode nicks working properly, even when gann | 17.2 KB |
|
|
|
conflicts.py |
1185.33.24 | 19 years ago | Martin Pool | Add alias 'resolved' | 3.3 KB |
|
|
|
delta.py |
1185.35.26 | 19 years ago | Aaron Bentley | Fixed diff and status on newly-added, newly-delete | 8 KB |
|
|
|
diff.py |
1185.35.29 | 19 years ago | Aaron Bentley | Support whitespace in diff filenames | 9.3 KB |
|
|
|
errors.py |
1185.33.17 | 19 years ago | Martin Pool | [merge] aaron, various fixes | 13.9 KB |
|
|
|
externalcommand.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 1.8 KB |
|
|
|
fetch.py |
1480 | 19 years ago | Robert Collins | BUGFIX: fetch was not skipping all missing parents | 9 KB |
|
|
|
gpg.py |
1442.1.62 | 19 years ago | Robert Collins | Allow creation of testaments from uncommitted data | 2.6 KB |
|
|
|
graph.py |
1185.8.3 | 19 years ago | Aaron Bentley | Fixed bug in distance-from-root graph operation | 3.9 KB |
|
|
|
hashcache.py |
1185.16.29 | 19 years ago | Martin Pool | [merge] config file and other things from robert | 8.1 KB |
|
|
|
help.py |
1185.33.15 | 19 years ago | Martin Pool | [path] bgu in help_on_command (Robert Widhopf-Fran | 4.9 KB |
|
|
|
identitymap.py |
1417.1.12 | 19 years ago | Robert Collins | cache revision history during read transactions | 3.3 KB |
|
|
|
info.py |
1390 | 19 years ago | Robert Collins | pair programming worx... merge integration and wea | 3.4 KB |
|
|
|
intset.py |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 4.8 KB |
|
|
|
inventory.py |
1185.33.3 | 19 years ago | Martin Pool | [merge] jelmer | 37.1 KB |
|
|
|
lock.py |
1185.23.3 | 19 years ago | Aaron Bentley | win32 locking fix from Belchenko | 7.7 KB |
|
|
|
log.py |
1185.35.19 | 19 years ago | Aaron Bentley | Tweaked short-log as Meinel suggested | 15.1 KB |
|
|
|
merge.py |
1185.35.13 | 19 years ago | Aaron Bentley | Merged Martin | 24.9 KB |
|
|
|
merge3.py |
1185.24.1 | 19 years ago | Aaron Bentley | Got reprocessing working | 13.5 KB |
|
|
|
merge_core.py |
1185.24.3 | 19 years ago | Aaron Bentley | Integrated reprocessing into the rest of the merge | 13 KB |
|
|
|
missing.py |
1185.35.30 | 19 years ago | Aaron Bentley | Fixed missing --verbose | 2.6 KB |
|
|
|
msgeditor.py |
1442.1.6 | 19 years ago | Robert Collins | first stage major overhaul of configs, giving use | 3.8 KB |
|
|
|
option.py |
1185.25.3 | 19 years ago | Aaron Bentley | Restored short options in help | 7.9 KB |
|
|
|
osutils.py |
1185.16.70 | 19 years ago | Martin Pool | - improved handling of non-ascii branch names and | 11.8 KB |
|
|
|
patch.py |
1185.1.40 | 19 years ago | Robert Collins | Merge what applied of Alexander Belchenko's win32 | 2 KB |
|
|
|
plugin.py |
1492 | 19 years ago | Robert Collins | Support decoration of commands. Commands.register | 5.6 KB |
|
|
|
progress.py |
1185.16.75 | 19 years ago | Martin Pool | - improved eta estimation for progress bar (patc | 9.8 KB |
|
|
|
revision.py |
1482 | 19 years ago | Robert Collins | 'revision.revision_graph can handle having only pa | 12.2 KB |
|
|
|
revisionspec.py |
1442.1.64 | 19 years ago | Robert Collins | Branch.open_containing now returns a tuple (Branch | 11.6 KB |
|
|
|
shellcomplete.py |
1185.16.45 | 19 years ago | Martin Pool | - refactor handling of short option names | 1.9 KB |
|
|
|
status.py |
1185.12.89 | 19 years ago | Aaron Bentley | Improved sort order of indirect merges | 4.5 KB |
|
|
|
testament.py |
1185.21.8 | 19 years ago | Jelmer Vernooij | Merge from Martin | 7 KB |
|
|
|
textinv.py |
1399.1.6 | 19 years ago | Robert Collins | move exporting functionality into inventory.py - u | 2.5 KB |
|
|
|
textui.py |
426 | 19 years ago | Martin Pool | - Skip symlinks during recursive add (path from aa | 1.1 KB |
|
|
|
trace.py |
1185.33.17 | 19 years ago | Martin Pool | [merge] aaron, various fixes | 8.1 KB |
|
|
|
transactions.py |
1417.1.10 | 19 years ago | Robert Collins | add a cache bound to Transactions, and a precious | 5.6 KB |
|
|
|
tree.py |
1465 | 19 years ago | Robert Collins | Bugfix the new pull --clobber to not generate spur | 11 KB |
|
|
|
tsort.py |
1185.16.114 | 19 years ago | mbp at sourcefrog | Improved topological sort | 2 KB |
|
|
|
ui.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 1.4 KB |
|
|
|
upgrade.py |
1185.33.22 | 19 years ago | Martin Pool | Remove obsolete import of revfile | 15.4 KB |
|
|
weave.py |
1185.16.124 | 19 years ago | Martin Pool | Add Weave.__contains__. | 36.5 KB |
|
|
|
weavefile.py |
1390 | 19 years ago | Robert Collins | pair programming worx... merge integration and wea | 4.1 KB |
|
|
|
win32console.py |
1185.16.86 | 19 years ago | mbp at sourcefrog | - win32 get_console_size from Alexander | 1 KB |
|
|
|
workingtree.py |
1497 | 19 years ago | Robert Collins | Move Branch.read_working_inventory to WorkingTree. | 18.6 KB |
|
|
|
xml.py |
1185.16.123 | 19 years ago | Martin Pool | Fix syntax of serializer_v5.pack_revision_to_strin | 2.5 KB |
|
|
|
xml4.py |
1399.1.10 | 19 years ago | Robert Collins | remove kind from the InventoryEntry constructor - | 6.5 KB |
|
|
|
xml5.py |
1185.16.37 | 19 years ago | Martin Pool | - properties are retrieved when revisions are load | 7.3 KB |
|
|