To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Aaron Bentley
- Date: 2005-10-01 06:48:01 UTC
- mto: (1185.12.13)
- Revision ID: aaron.bentley@utoronto.ca-20051001064801-7400c2ed0fe26080
Made iter_conflicts a WorkingTree method
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
plugins
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
selftest
|
723 | 20 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
|
store
|
1185.11.1 | 20 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
transport
|
1185.11.1 | 20 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
util
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
__init__.py |
1393.1.13 | 20 years ago | Martin Pool | - set new version for this branch | 1.9 KB |
|
|
|
add.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 5.3 KB |
|
|
|
annotate.py |
1385 | 20 years ago | Martin Pool | - simple weave-based annotate code (not complete) | 1.8 KB |
|
|
|
atomicfile.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 2.6 KB |
|
|
|
branch.py |
1393.1.22 | 20 years ago | Martin Pool | - clean up Branch.append_revision() | 47.3 KB |
|
|
|
builtins.py |
1185.14.2 | 20 years ago | Aaron Bentley | Merge from mpool | 44.5 KB |
|
|
|
changeset.py |
1185.1.41 | 20 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 51.7 KB |
|
|
|
check.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 7.4 KB |
|
|
|
clone.py |
1393.1.23 | 20 years ago | Martin Pool | - fix cloning of part of a branch - add test for | 6.2 KB |
|
|
|
commands.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 21 KB |
|
|
|
commit.py |
1393.1.21 | 20 years ago | Martin Pool | - merge merge and export fixes from aaron aaron.be | 19.4 KB |
|
|
|
delta.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 7.5 KB |
|
|
|
diff.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 8.2 KB |
|
|
|
errors.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 6.5 KB |
|
|
|
externalcommand.py |
1185.1.41 | 20 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 1.8 KB |
|
|
|
fetch.py |
1393.1.17 | 20 years ago | Martin Pool | - add assertion to fetch | 8.7 KB |
|
|
|
graph.py |
1185.8.3 | 20 years ago | Aaron Bentley | Fixed bug in distance-from-root graph operation | 3.9 KB |
|
|
|
hashcache.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 7.7 KB |
|
|
|
help.py |
1185.11.5 | 20 years ago | John Arbash Meinel | Merged up-to-date against mainline, still broken. | 4.5 KB |
|
|
|
info.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 3.4 KB |
|
|
|
intset.py |
1185.1.20 | 20 years ago | Robert Collins | remove unneeded shebangs | 4.8 KB |
|
|
|
inventory.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 18.8 KB |
|
|
|
lock.py |
1185.9.2 | 20 years ago | Harald Meland | Use fcntl.lockf() rather than fcntl.flock() to sup | 7.7 KB |
|
|
|
log.py |
1313 | 20 years ago | Martin Pool | - rename to Revision.parent_ids to avoid confusion | 11.4 KB |
|
|
|
mdiff.py |
1185.1.41 | 20 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 3.8 KB |
|
|
|
merge.py |
1185.14.2 | 20 years ago | Aaron Bentley | Merge from mpool | 19.1 KB |
|
|
|
merge3.py |
974.1.52 | 20 years ago | aaron.bentley at utoronto | Merged mpool's latest changes (~0.0.7) | 11.9 KB |
|
|
|
merge_core.py |
1185.14.2 | 20 years ago | Aaron Bentley | Merge from mpool | 10.4 KB |
|
|
|
meta_store.py |
1393.2.2 | 20 years ago | John Arbash Meinel | Updated stores to use Transport | 2.5 KB |
|
|
|
missing.py |
1393.1.8 | 20 years ago | Martin Pool | - remove redundant import | 2.6 KB |
|
|
|
msgeditor.py |
1185.1.30 | 20 years ago | Robert Collins | Accept and tweak David Clymers BZREDITOR support p | 3.8 KB |
|
|
|
osutils.py |
1391 | 20 years ago | Robert Collins | merge from integration | 12.3 KB |
|
|
|
patch.py |
1185.1.40 | 20 years ago | Robert Collins | Merge what applied of Alexander Belchenko's win32 | 2 KB |
|
|
|
plugin.py |
1185.11.1 | 20 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not | 4.6 KB |
|
|
|
progress.py |
1308 | 20 years ago | Martin Pool | - make progress bar more tolerant of out-of-range | 9.3 KB |
|
|
|
revfile.py |
1185.1.41 | 20 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 17.8 KB |
|
|
|
revision.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 10.6 KB |
|
|
|
revisionspec.py |
1393.2.1 | 20 years ago | John Arbash Meinel | Merged in split-storage-2 branch. Need to cleanup | 10.4 KB |
|
|
|
shellcomplete.py |
1185.1.9 | 20 years ago | Robert Collins | Clint Adams patch for shell completion hints | 1.9 KB |
|
|
|
status.py |
1185.1.35 | 20 years ago | Robert Collins | Heikki Paajanen's status -r patch | 3.4 KB |
|
|
|
textinv.py |
1185.1.41 | 20 years ago | Robert Collins | massive patch from Alexander Belchenko - many PEP8 | 2.5 KB |
|
|
|
textui.py |
426 | 20 years ago | Martin Pool | - Skip symlinks during recursive add (path from aa | 1.1 KB |
|
|
|
trace.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 5.8 KB |
|
|
|
tree.py |
1369 | 20 years ago | Martin Pool | - try to avoid redundant conversion of strings whe | 11.5 KB |
|
|
|
ui.py |
1092.1.39 | 20 years ago | Robert Collins | merge from mpool | 1.4 KB |
|
|
|
upgrade.py |
1393.1.18 | 20 years ago | Martin Pool | - fix upgrade for transport changes | 15.5 KB |
|
|
|
weave.py |
1393.1.4 | 20 years ago | Martin Pool | - weave tool now finds bzrlib if it's not on the d | 31.2 KB |
|
|
|
weavefile.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 4.1 KB |
|
|
|
workingtree.py |
1185.14.6 | 20 years ago | Aaron Bentley | Made iter_conflicts a WorkingTree method | 9.4 KB |
|
|
|
xml.py |
1390 | 20 years ago | Robert Collins | pair programming worx... merge integration and wea | 2.6 KB |
|
|
|
xml4.py |
1314 | 20 years ago | Martin Pool | - Fix up one more RevisionReference bit | 5.9 KB |
|
|
|
xml5.py |
1351 | 20 years ago | Martin Pool | - better assertion message | 4.9 KB |
|
|