- Committer: Aaron Bentley
- Date: 2005-10-20 00:49:17 UTC
- mto: (1185.25.1)
- Revision ID: aaron.bentley@utoronto.ca-20051020004917-6c576ac8d91f46ea
Restored merge-type selection
| 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 |
1442.1.64 | 19 years ago | Robert Collins | Branch.open_containing now returns a tuple (Branch | 5.5 KB |
|
|
|
annotate.py |
1442.1.64 | 19 years ago | Robert Collins | Branch.open_containing now returns a tuple (Branch | 3.5 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 |
1185.12.60 | 19 years ago | Aaron Bentley | Merge from mainline | 47.6 KB |
|
|
|
builtins.py |
1185.12.61 | 19 years ago | Aaron Bentley | Merge my show-base change | 51.6 KB |
|
|
|
changeset.py |
1185.12.40 | 19 years ago | abentley | Got even closer to standard Tree interface | 54.2 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 |
1185.12.56 | 19 years ago | Aaron Bentley | Prevented display commands from printing broken pi | 17.1 KB |
|
|
|
commit.py |
1185.16.72 | 19 years ago | Martin Pool | [merge] from robert and fix up tests | 17.2 KB |
|
|
|
config.py |
1185.12.53 | 19 years ago | Aaron Bentley | Merged more from Robert | 14.4 KB |
|
|
|
conflicts.py |
1442.1.64 | 19 years ago | Robert Collins | Branch.open_containing now returns a tuple (Branch | 2.6 KB |
|
|
|
delta.py |
1185.12.33 | 19 years ago | Aaron Bentley | Fixed symlink reverting | 8 KB |
|
|
|
diff.py |
1432 | 19 years ago | Robert Collins | branch: namespace | 8.9 KB |
|
|
|
errors.py |
1185.12.60 | 19 years ago | Aaron Bentley | Merge from mainline | 10.6 KB |
|
|
|
externalcommand.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 1.8 KB |
|
|
|
fetch.py |
1185.12.21 | 19 years ago | aaron.bentley at utoronto | Cleaned up Fetcher._find_last_revision | 8.9 KB |
|
|
|
gpg.py |
1442.1.62 | 19 years ago | Robert Collins | Allow creation of testaments from uncommitted data | 2.6 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.12.55 | 19 years ago | Aaron Bentley | did test wrapping for option text | 4.9 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 |
1185.16.72 | 19 years ago | Martin Pool | [merge] from robert and fix up tests | 37 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 |
1185.12.27 | 19 years ago | Aaron Bentley | Use line log for pending merges | 15.4 KB |
|
|
|
mdiff.py |
1185.1.41 | 19 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 3.8 KB |
|
|
|
merge.py |
1185.19.1 | 19 years ago | Aaron Bentley | merged show-base from other branch | 17.3 KB |
|
|
|
merge3.py |
1185.18.1 | 19 years ago | Aaron Bentley | Added --show-base to merge | 12.2 KB |
|
|
|
merge_core.py |
1185.18.1 | 19 years ago | Aaron Bentley | Added --show-base to merge | 11.4 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 |
|
|
|
option.py |
1185.12.62 | 19 years ago | Aaron Bentley | Restored merge-type selection | 7.5 KB |
|
|
|
osutils.py |
1185.16.70 | 19 years ago | Martin Pool | - improved handling of non-ascii branch names and | 11.8 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 |
1185.16.75 | 19 years ago | Martin Pool | - improved eta estimation for progress bar (patc | 9.8 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.64 | 19 years ago | Robert Collins | Branch.open_containing now returns a tuple (Branch | 11.6 KB |
|
|
|
shellcomplete.py |
1185.16.45 | 19 years ago | Martin Pool | - refactor handling of short option names | 1.9 KB |
|
|
|
status.py |
1185.12.27 | 19 years ago | Aaron Bentley | Use line log for pending merges | 3.8 KB |
|
|
|
testament.py |
1442.1.62 | 19 years ago | Robert Collins | Allow creation of testaments from uncommitted data | 7 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.16.74 | 19 years ago | Martin Pool | doc | 6.2 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 |
1185.12.39 | 19 years ago | abentley | Propogated has_or_had_id to Tree | 10.7 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 |
1185.12.60 | 19 years ago | Aaron Bentley | Merge from mainline | 17.1 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 |
|
|