- Committer: Martin Pool
- Date: 2005-08-25 05:58:05 UTC
- mfrom: (974.1.36)
- Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:
* When merging, pull in all missing revisions from the source
branch.
* Detect common ancestors by looking at the whole ancestry graph,
rather than just mainline history.
Some changes to reconcile this with parallel updates to the test and
trace code.
aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
* When merging, pull in all missing revisions from the source
branch.
* Detect common ancestors by looking at the whole ancestry graph,
rather than just mainline history.
Some changes to reconcile this with parallel updates to the test and
trace code.
aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
| 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 |
|
||
|
util
|
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
__init__.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.8 KB |
|
|
|
add.py |
1103 | 19 years ago | Martin Pool | - some pychecker cleanups | 3.6 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 47.3 KB |
|
|
|
changeset.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 51.7 KB |
|
|
|
check.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 9.2 KB |
|
|
|
commands.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 61.1 KB |
|
|
|
commit.py |
1097 | 19 years ago | Martin Pool | - send trace messages out through python logging m | 11.3 KB |
|
|
|
delta.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 7.5 KB |
|
|
|
diff.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 8.1 KB |
|
|
|
errors.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 2.8 KB |
|
|
|
fetch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 6 KB |
|
|
|
hashcache.py |
954 | 19 years ago | Martin Pool | - separate out code that just scans the hash cache | 7.5 KB |
|
|
|
help.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3.9 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 |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 19.7 KB |
|
|
|
lock.py |
951 | 19 years ago | Martin Pool | - fix up self reference in msvc lock object | 7.6 KB |
|
|
|
log.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 11.4 KB |
|
|
|
mdiff.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3.8 KB |
|
|
|
merge.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 15.6 KB |
|
|
|
merge3.py |
839 | 19 years ago | Martin Pool | - avoid copying string lists when handling unmatch | 11.9 KB |
|
|
|
merge_core.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 28.4 KB |
|
|
|
meta_store.py |
790 | 19 years ago | Martin Pool | Merge from aaron: ------------------------------- | 1.6 KB |
|
|
|
missing.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3.1 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 |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 14.2 KB |
|
|
|
patch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.8 KB |
|
|
|
plugin.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 4.6 KB |
|
|
|
progress.py |
1104 | 19 years ago | Martin Pool | - Add a simple UIFactory The idea of this is t | 9.2 KB |
|
|
|
remotebranch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 5.4 KB |
|
|
|
revfile.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 17.8 KB |
|
|
|
revision.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 8.9 KB |
|
|
|
shellcomplete.py |
1091 | 19 years ago | Martin Pool | - new shell-complete command to help zsh completio | 1.9 KB |
|
|
|
status.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 2 KB |
|
|
|
store.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 7.3 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 |
1108 | 19 years ago | Martin Pool | - more cleanups of error reporting | 5.4 KB |
|
|
|
tree.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 11.1 KB |
|
|
|
ui.py |
1104 | 19 years ago | Martin Pool | - Add a simple UIFactory The idea of this is t | 1.4 KB |
|
|
|
upgrade.py |
1104 | 19 years ago | Martin Pool | - Add a simple UIFactory The idea of this is t | 5.2 KB |
|
|
|
weave.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 28.6 KB |
|
|
|
weavefile.py |
1103 | 19 years ago | Martin Pool | - some pychecker cleanups | 4.1 KB |
|
|
|
workingtree.py |
956 | 19 years ago | Martin Pool | doc | 9 KB |
|
|
|
xml.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.3 KB |
|
|