- Committer: Martin Pool
- Date: 2005-07-04 13:08:55 UTC
- Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve
- test cases for this
- test cases for this
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
selftest
|
723 | 19 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
__init__.py |
806 | 19 years ago | Martin Pool | - Cope if locale.getpreferredencoding() returns No | 1.8 KB |
|
|
|
add.py |
800 | 19 years ago | Martin Pool | Merge John's import-speedup branch: | 3.5 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
820 | 19 years ago | Martin Pool | - faster Branch.get_revision_inventory now we know | 39.2 KB |
|
|
|
changeset.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 52.2 KB |
|
|
|
check.py |
819 | 19 years ago | Martin Pool | - check command checks that all inventory-ids are | 6.9 KB |
|
|
|
commands.py |
807 | 19 years ago | Martin Pool | - New log --long option Patch from William Dodé | 52.2 KB |
|
|
|
commit.py |
818 | 19 years ago | Martin Pool | - Clear pending-merge list when committing. | 10.5 KB |
|
|
|
diff.py |
804 | 19 years ago | Martin Pool | Patch from John: - StringIO mixes poorly with dif | 14.7 KB |
|
|
|
errors.py |
753 | 19 years ago | Martin Pool | - new exception NotVersionedError - raise this fro | 1.8 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 |
|
|
|
inventory.py |
802 | 19 years ago | Martin Pool | - Remove XMLMixin class in favour of simple pack_x | 18.6 KB |
|
|
|
lock.py |
656 | 19 years ago | Martin Pool | - create branch lock files if they don't exist | 7.6 KB |
|
|
|
log.py |
805 | 19 years ago | Martin Pool | Merge John's log patch: implements bzr log --forw | 9.1 KB |
|
|
|
mdiff.py |
225 | 19 years ago | mbp at sourcefrog | debug output | 2.2 KB |
|
|
|
merge.py |
628 | 19 years ago | Martin Pool | - merge aaron's updated merge/pull code | 10.2 KB |
|
|
|
merge3.py |
821 | 19 years ago | Martin Pool | - start code for built-in diff3-style resolve - t | 2.7 KB |
|
|
|
merge_core.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 19.1 KB |
|
|
|
meta_store.py |
790 | 19 years ago | Martin Pool | Merge from aaron: ------------------------------- | 1.6 KB |
|
|
|
newinventory.py |
800 | 19 years ago | Martin Pool | Merge John's import-speedup branch: | 4.3 KB |
|
|
|
osutils.py |
779 | 19 years ago | Martin Pool | - better quotefn for windows: use doublequotes for | 12.7 KB |
|
|
|
patch.py |
493 | 19 years ago | Martin Pool | - Merge aaron's merge command | 2.5 KB |
|
|
|
plugin.py |
800 | 19 years ago | Martin Pool | Merge John's import-speedup branch: | 4.6 KB |
|
|
|
progress.py |
695 | 19 years ago | Martin Pool | - don't display progress bars on really dumb termi | 7.6 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 |
|
|
|
statcache.py |
637 | 19 years ago | Martin Pool | - add assertion | 8.6 KB |
|
|
|
status.py |
610 | 19 years ago | Martin Pool | - replace Branch.lock(mode) with separate lock_rea | 1.8 KB |
|
|
|
store.py |
790 | 19 years ago | Martin Pool | Merge from aaron: ------------------------------- | 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 |
403 | 19 years ago | Martin Pool | - Don't give an error if the trace file can't be o | 3.8 KB |
|
|
|
tree.py |
800 | 19 years ago | Martin Pool | Merge John's import-speedup branch: | 9.9 KB |
|
|
|
upgrade.py |
802 | 19 years ago | Martin Pool | - Remove XMLMixin class in favour of simple pack_x | 5.1 KB |
|
|
|
workingtree.py |
489 | 19 years ago | Martin Pool | - WorkingTree loads statcache in constructor and h | 8.8 KB |
|
|
|
xml.py |
802 | 19 years ago | Martin Pool | - Remove XMLMixin class in favour of simple pack_x | 1.3 KB |
|
|