- Committer: Robert Collins
- Date: 2005-10-17 00:00:33 UTC
- mfrom: (1458)
- Revision ID: robertc@lifelesslap.robertcollins.net-20051017000033-b7385b1772d31605
merge in integration
| 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.27 | 19 years ago | Martin Pool | - increment version | 1.9 KB |
|
|
|
add.py |
1457.1.4 | 19 years ago | Robert Collins | Branch.relpath has been moved to WorkingTree.relpa | 5.5 KB |
|
|
|
annotate.py |
1457.1.4 | 19 years ago | Robert Collins | Branch.relpath has been moved to WorkingTree.relpa | 2.8 KB |
|
|
|
atomicfile.py |
1393.2.1 | 19 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 2.6 KB |
|
|
|
branch.py |
1442.1.49 | 19 years ago | Robert Collins | merge in integration | 50 KB |
|
|
|
builtins.py |
1457.1.4 | 19 years ago | Robert Collins | Branch.relpath has been moved to WorkingTree.relpa | 48.3 KB |
|
|
|
changeset.py |
1448 | 19 years ago | Robert Collins | revert symlinks correctly | 51.6 KB |
|
|
|
check.py |
1449 | 19 years ago | Robert Collins | teach check about ghosts | 7.9 KB |
|
|
|
clone.py |
1185.15.5 | 19 years ago | Martin Pool | - clone should be done with the source branch read | 6.4 KB |
|
|
|
commands.py |
1446 | 19 years ago | Robert Collins | fixup the verbose-does-nothing for add - add a --q | 21.4 KB |
|
|
|
commit.py |
1455 | 19 years ago | Robert Collins | merge from martin | 16.2 KB |
|
|
|
config.py |
1442.1.21 | 19 years ago | Robert Collins | create signature_needed() call for commit to trigg | 11.4 KB |
|
|
|
conflicts.py |
1185.16.33 | 19 years ago | Martin Pool | - move 'conflict' and 'resolved' from shipped plug | 2.6 KB |
|
|
|
delta.py |
1448 | 19 years ago | Robert Collins | revert symlinks correctly | 7.9 KB |
|
|
|
diff.py |
1432 | 19 years ago | Robert Collins | branch: namespace | 8.9 KB |
|
|
|
errors.py |
1449 | 19 years ago | Robert Collins | teach check about ghosts | 8.1 KB |
|
|
|
externalcommand.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 1.8 KB |
|
|
|
fetch.py |
1440 | 19 years ago | Robert Collins | further tuning of pull, do not do a local merge or | 9.2 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.11.5 | 19 years ago | John Arbash Meinel | Merged up-to-date against mainline, still broken. | 4.5 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 |
1454 | 19 years ago | Robert Collins | Merge from Martin. | 36.6 KB |
|
|
|
lock.py |
1185.9.2 | 19 years ago | Harald Meland | Use fcntl.lockf() rather than fcntl.flock() to sup | 7.7 KB |
|
|
|
log.py |
1433 | 19 years ago | Robert Collins | merge in and make incremental Gustavo Niemeyers ne | 14.1 KB |
|
|
|
mdiff.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 3.8 KB |
|
|
|
merge.py |
1457.1.4 | 19 years ago | Robert Collins | Branch.relpath has been moved to WorkingTree.relpa | 19.8 KB |
|
|
|
merge3.py |
974.1.52 | 19 years ago | aaron.bentley at utoronto | Merged mpool's latest changes (~0.0.7) | 11.9 KB |
|
|
|
merge_core.py |
1448 | 19 years ago | Robert Collins | revert symlinks correctly | 12.9 KB |
|
|
|
missing.py |
1393.1.8 | 19 years ago | Martin Pool | - remove redundant import | 2.6 KB |
|
|
|
msgeditor.py |
1442.1.6 | 19 years ago | Robert Collins | first stage major overhaul of configs, giving use | 3.8 KB |
|
|
|
osutils.py |
1457.1.2 | 19 years ago | Robert Collins | move branch._relpath into osutils as relpath | 11 KB |
|
|
|
patch.py |
1185.1.40 | 19 years ago | Robert Collins | Merge what applied of Alexander Belchenko's win32 | 2 KB |
|
|
|
plugin.py |
1442.1.23 | 19 years ago | Robert Collins | Plugins are now loaded under bzrlib.plugins, not b | 4.7 KB |
|
|
|
progress.py |
1308 | 19 years ago | Martin Pool | - make progress bar more tolerant of out-of-range | 9.3 KB |
|
|
|
revfile.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 17.8 KB |
|
|
|
revision.py |
1185.16.40 | 19 years ago | Martin Pool | todo | 11.2 KB |
|
|
|
revisionspec.py |
1442.1.45 | 19 years ago | Robert Collins | replace __contains__ calls in stores with has_id | 11.6 KB |
|
|
|
shellcomplete.py |
1185.1.9 | 19 years ago | Robert Collins | Clint Adams patch for shell completion hints | 1.9 KB |
|
|
|
status.py |
1185.13.2 | 19 years ago | Robert Collins | Merge Aarons conflict plugin for 0.1rc1 | 3.5 KB |
|
|
|
testament.py |
1185.16.38 | 19 years ago | Martin Pool | - move contains_whitespace and contains_linebreaks | 6.2 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.15.9 | 19 years ago | Martin Pool | [patch] show argv and pwd in exceptions (from ddaa | 6 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 |
1417.1.8 | 19 years ago | Robert Collins | use transactions in the weave store interface, whi | 10.4 KB |
|
|
|
ui.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 1.4 KB |
|
|
|
upgrade.py |
1442.1.45 | 19 years ago | Robert Collins | replace __contains__ calls in stores with has_id | 15.7 KB |
|
|
|
weave.py |
1185.16.13 | 19 years ago | Martin Pool | todo | 37.8 KB |
|
|
|
weavefile.py |
1390 | 19 years ago | Robert Collins | pair programming worx... merge integration and wea | 4.1 KB |
|
|
|
workingtree.py |
1457.1.3 | 19 years ago | Robert Collins | make Branch.relpath delegate to the working tree. | 12.6 KB |
|
|
|
xml.py |
1399.1.8 | 19 years ago | Robert Collins | factor out inventory directory logic into 'Invento | 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 |
|
|