- Committer: Robert Collins
- Date: 2005-08-25 10:04:51 UTC
- mto: (974.1.50) (1185.1.10) (1092.3.1)
- Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
plugins
|
1066 | 19 years ago | Martin Pool | - rearrangement of modules, contributed by Gustavo |
|
||
|
selftest
|
723 | 19 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
|
util
|
1066 | 19 years ago | Martin Pool | - rearrangement of modules, contributed by Gustavo |
|
||
__init__.py |
1092.1.35 | 19 years ago | Robert Collins | merge from mpool up to rev 1110 | 1.9 KB |
|
|
|
add.py |
1092.1.30 | 19 years ago | Robert Collins | change smart_add reporting of added files to callb | 4.8 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
1092.1.36 | 19 years ago | Robert Collins | should run tests before committing, tsk. move an i | 48.2 KB |
|
|
|
changeset.py |
1092.1.18 | 19 years ago | Robert Collins | merge from mpool | 51.7 KB |
|
|
|
check.py |
1092.1.21 | 19 years ago | Robert Collins | merge up with mpool | 9.2 KB |
|
|
|
commands.py |
1092.1.36 | 19 years ago | Robert Collins | should run tests before committing, tsk. move an i | 60.4 KB |
|
|
|
commit.py |
1092.1.18 | 19 years ago | Robert Collins | merge from mpool | 11.3 KB |
|
|
|
delta.py |
1014 | 19 years ago | Martin Pool | - correctly exclude root_directory from search for | 7.5 KB |
|
|
|
diff.py |
1040 | 19 years ago | Martin Pool | - merge patch to take ranges to diff -r option | 8.1 KB |
|
|
|
errors.py |
1092.1.35 | 19 years ago | Robert Collins | merge from mpool up to rev 1110 | 2.8 KB |
|
|
|
fetch.py |
1092.1.35 | 19 years ago | Robert Collins | merge from mpool up to rev 1110 | 6 KB |
|
|
|
hashcache.py |
954 | 19 years ago | Martin Pool | - separate out code that just scans the hash cache | 7.5 KB |
|
|
|
help.py |
1092.1.18 | 19 years ago | Robert Collins | merge from mpool | 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 |
1092.1.30 | 19 years ago | Robert Collins | change smart_add reporting of added files to callb | 20.6 KB |
|
|
|
lock.py |
951 | 19 years ago | Martin Pool | - fix up self reference in msvc lock object | 7.6 KB |
|
|
|
log.py |
1012 | 19 years ago | Martin Pool | - some cleanup of log code to have less special ca | 11.4 KB |
|
|
|
mdiff.py |
1063 | 19 years ago | Martin Pool | - fix mdiff handling of files without a trailing n | 3.8 KB |
|
|
|
merge.py |
1092.1.38 | 19 years ago | Robert Collins | make a default merge choose a sane base with branc | 16 KB |
|
|
|
merge3.py |
839 | 19 years ago | Martin Pool | - avoid copying string lists when handling unmatch | 11.9 KB |
|
|
|
merge_core.py |
1092.1.23 | 19 years ago | Robert Collins | move merge_core tests into the selftest package. A | 10.1 KB |
|
|
|
meta_store.py |
790 | 19 years ago | Martin Pool | Merge from aaron: ------------------------------- | 1.6 KB |
|
|
|
missing.py |
1054 | 19 years ago | Martin Pool | - merge john's "missing" command | 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 |
1077 | 19 years ago | Martin Pool | - avoid compiling REs at module load time | 14.2 KB |
|
|
|
patch.py |
1069 | 19 years ago | Martin Pool | - merge merge improvements from aaron revisions | 1.8 KB |
|
|
|
plugin.py |
1066 | 19 years ago | Martin Pool | - rearrangement of modules, contributed by Gustavo | 4.6 KB |
|
|
|
progress.py |
1092.1.21 | 19 years ago | Robert Collins | merge up with mpool | 9.2 KB |
|
|
|
remotebranch.py |
1066 | 19 years ago | Martin Pool | - rearrangement of modules, contributed by Gustavo | 5.4 KB |
|
|
|
revfile.py |
1064 | 19 years ago | Martin Pool | - allow an irev or drev name to be given on the re | 17.8 KB |
|
|
|
revision.py |
1092.1.35 | 19 years ago | Robert Collins | merge from mpool up to rev 1110 | 8.9 KB |
|
|
|
shellcomplete.py |
1091 | 19 years ago | Martin Pool | - new shell-complete command to help zsh completio | 1.9 KB |
|
|
|
status.py |
1005 | 19 years ago | Martin Pool | - split TreeDelta and compare_trees out into new m | 2 KB |
|
|
|
store.py |
1092.1.35 | 19 years ago | Robert Collins | merge from mpool up to rev 1110 | 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 |
1092.1.32 | 19 years ago | Robert Collins | merge from mpool up to 1109 | 5.4 KB |
|
|
|
tree.py |
1069 | 19 years ago | Martin Pool | - merge merge improvements from aaron revisions | 11.1 KB |
|
|
|
ui.py |
1092.1.21 | 19 years ago | Robert Collins | merge up with mpool | 1.4 KB |
|
|
|
upgrade.py |
1092.1.21 | 19 years ago | Robert Collins | merge up with mpool | 5.2 KB |
|
|
|
weave.py |
1084 | 19 years ago | Martin Pool | - weave add command needs to take a symbolic name | 28.6 KB |
|
|
|
weavefile.py |
1092.1.18 | 19 years ago | Robert Collins | merge from mpool | 4.1 KB |
|
|
|
workingtree.py |
956 | 19 years ago | Martin Pool | doc | 9 KB |
|
|
|
xml.py |
1066 | 19 years ago | Martin Pool | - rearrangement of modules, contributed by Gustavo | 1.3 KB |
|
|