- Committer: Aaron Bentley
- Date: 2005-08-11 19:54:55 UTC
- mto: (1092.1.41) (1185.3.4) (974.1.47)
- Revision ID: abentley@panoramicfeedback.com-20050811195455-91f52bb566728ac7
Fixed spurious new_contents_conflict
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
selftest
|
723 | 19 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
__init__.py |
970 | 19 years ago | Martin Pool | doc | 1.9 KB |
|
|
|
add.py |
974 | 19 years ago | Martin Pool | - start adding tests for commit in subdir - change | 3.6 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
961 | 19 years ago | Martin Pool | - remove python2.3 set workarounds | 46.1 KB |
|
|
|
changeset.py |
974.1.23 | 19 years ago | Aaron Bentley | Avoided unnecessary temp files | 51.4 KB |
|
|
|
check.py |
909 | 19 years ago | Martin Pool | - merge John's code to give the tree root an expli | 9.1 KB |
|
|
|
commands.py |
974.1.11 | 19 years ago | aaron.bentley at utoronto | replaced revert with merge-revert | 58 KB |
|
|
|
commit.py |
958 | 19 years ago | Martin Pool | - tidy up imports to use full module names | 11 KB |
|
|
|
diff.py |
974.1.5 | 19 years ago | Aaron Bentley | Fixed handling of missing newlines in udiffs | 14.6 KB |
|
|
|
errors.py |
885 | 19 years ago | Martin Pool | - commit command refuses unless something is chang | 1.9 KB |
|
|
|
hashcache.py |
954 | 19 years ago | Martin Pool | - separate out code that just scans the hash cache | 7.5 KB |
|
|
|
help.py |
675 | 19 years ago | Martin Pool | - help formatting fix from ndim | 4.5 KB |
|
|
|
info.py |
542 | 19 years ago | Martin Pool | - fix typo | 3.4 KB |
|
|
|
intset.py |
927 | 19 years ago | Martin Pool | - oops, set() is much faster than intset | 4.9 KB |
|
|
|
inventory.py |
955 | 19 years ago | Martin Pool | - use __slots__ on InventoryEntry; rather faster | 19.6 KB |
|
|
|
lock.py |
951 | 19 years ago | Martin Pool | - fix up self reference in msvc lock object | 7.6 KB |
|
|
|
log.py |
923 | 19 years ago | Martin Pool | - merge aaron's bugfix branch up to abentley@pan | 9.5 KB |
|
|
|
mdiff.py |
225 | 19 years ago | mbp at sourcefrog | debug output | 2.2 KB |
|
|
|
merge.py |
974.1.23 | 19 years ago | Aaron Bentley | Avoided unnecessary temp files | 12.1 KB |
|
|
|
merge3.py |
839 | 19 years ago | Martin Pool | - avoid copying string lists when handling unmatch | 11.9 KB |
|
|
|
merge_core.py |
974.1.24 | 19 years ago | Aaron Bentley | Fixed spurious new_contents_conflict | 28 KB |
|
|
|
meta_store.py |
790 | 19 years ago | Martin Pool | Merge from aaron: ------------------------------- | 1.6 KB |
|
|
|
newinventory.py |
909 | 19 years ago | Martin Pool | - merge John's code to give the tree root an expli | 4.3 KB |
|
|
|
osutils.py |
972 | 19 years ago | Martin Pool | - less dodgy is_inside function | 13.5 KB |
|
|
|
patch.py |
974.1.15 | 19 years ago | aaron.bentley at utoronto | Removed use of patch and diff in merge, removed pa | 1.8 KB |
|
|
|
plugin.py |
961 | 19 years ago | Martin Pool | - remove python2.3 set workarounds | 4.5 KB |
|
|
|
progress.py |
964 | 19 years ago | Martin Pool | - show progress on dumb terminals by printing dots | 8.9 KB |
|
|
|
remotebranch.py |
803 | 19 years ago | Martin Pool | - Remove dead code from remotebranch | 5 KB |
|
|
|
revfile.py |
558 | 19 years ago | Martin Pool | - All top-level classes inherit from object (Pyt | 15.4 KB |
|
|
|
revision.py |
816 | 19 years ago | Martin Pool | - don't write precursor field in new revision xml | 5.2 KB |
|
|
|
status.py |
915 | 19 years ago | Martin Pool | - add simple test case for bzr status - show_stat | 2 KB |
|
|
|
store.py |
909 | 19 years ago | Martin Pool | - merge John's code to give the tree root an expli | 6.5 KB |
|
|
|
textinv.py |
236 | 19 years ago | mbp at sourcefrog | - Experiments in inventory performance | 2.5 KB |
|
|
|
textui.py |
426 | 19 years ago | Martin Pool | - Skip symlinks during recursive add (path from aa | 1.1 KB |
|
|
|
trace.py |
949 | 19 years ago | Martin Pool | - add back update-hashes command for testing/profi | 3.9 KB |
|
|
|
tree.py |
974.1.14 | 19 years ago | aaron.bentley at utoronto | Fixed bugs in merge optimization | 11 KB |
|
|
|
upgrade.py |
802 | 19 years ago | Martin Pool | - Remove XMLMixin class in favour of simple pack_x | 5.1 KB |
|
|
|
weave.py |
947 | 19 years ago | Martin Pool | - new 'weave stats' command | 26.4 KB |
|
|
|
weavefile.py |
944 | 19 years ago | Martin Pool | - refactor member names in Weave code | 3.7 KB |
|
|
|
workingtree.py |
956 | 19 years ago | Martin Pool | doc | 9 KB |
|
|
|
xml.py |
802 | 19 years ago | Martin Pool | - Remove XMLMixin class in favour of simple pack_x | 1.3 KB |
|
|