~bzr-pqm/bzr/bzr.dev

  • Committer: Aaron Bentley
  • Date: 2005-08-26 14:39:43 UTC
  • mfrom: (974.2.7) (974.2.6)
  • mto: (1185.3.4)
  • Revision ID: abentley@panoramicfeedback.com-20050826143943-c677569cfb887d35
Merged changes from the merge4 branch
Filename Latest Rev Last Changed Committer Comment Size
..
plugins 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf Diff
selftest 723 19 years ago Martin Pool - move whitebox/blackbox modules into bzrlib.selft Diff
util 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf Diff
__init__.py 970 19 years ago Martin Pool doc 1.9 KB Diff Download File
add.py 974 19 years ago Martin Pool - start adding tests for commit in subdir - change 3.6 KB Diff Download File
atomicfile.py 565 19 years ago Martin Pool - more invariant checks in AtomicFile 2.9 KB Diff Download File
branch.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 48.9 KB Diff Download File
changeset.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 51.7 KB Diff Download File
check.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 9.2 KB Diff Download File
commands.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 60.2 KB Diff Download File
commit.py 958 19 years ago Martin Pool - tidy up imports to use full module names 11 KB Diff Download File
delta.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 7.5 KB Diff Download File
diff.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 8.1 KB Diff Download File
errors.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 2.9 KB Diff Download File
fetch.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 6 KB Diff Download File
hashcache.py 954 19 years ago Martin Pool - separate out code that just scans the hash cache 7.5 KB Diff Download File
help.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 3.9 KB Diff Download File
info.py 542 19 years ago Martin Pool - fix typo 3.4 KB Diff Download File
intset.py 927 19 years ago Martin Pool - oops, set() is much faster than intset 4.9 KB Diff Download File
inventory.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 19.6 KB Diff Download File
lock.py 951 19 years ago Martin Pool - fix up self reference in msvc lock object 7.6 KB Diff Download File
log.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 11.4 KB Diff Download File
mdiff.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 3.8 KB Diff Download File
merge.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 15 KB Diff Download File
merge3.py 974.1.45 19 years ago aaron.bentley at utoronto Shortened conflict markers to 7 characters, to ple 11.8 KB Diff Download File
merge_core.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 28.4 KB Diff Download File
meta_store.py 790 19 years ago Martin Pool Merge from aaron: ------------------------------- 1.6 KB Diff Download File
missing.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 3.1 KB Diff Download File
newinventory.py 909 19 years ago Martin Pool - merge John's code to give the tree root an expli 4.3 KB Diff Download File
osutils.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 13.7 KB Diff Download File
patch.py 974.1.15 19 years ago aaron.bentley at utoronto Removed use of patch and diff in merge, removed pa 1.8 KB Diff Download File
plugin.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 4.6 KB Diff Download File
progress.py 964 19 years ago Martin Pool - show progress on dumb terminals by printing dots 8.9 KB Diff Download File
remotebranch.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 5.4 KB Diff Download File
revfile.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 17.8 KB Diff Download File
revision.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 11.1 KB Diff Download File
status.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 2 KB Diff Download File
store.py 974.1.47 19 years ago Aaron Bentley Merged changes from the merge4 branch 7.4 KB Diff Download File
textinv.py 236 19 years ago mbp at sourcefrog - Experiments in inventory performance 2.5 KB Diff Download File
textui.py 426 19 years ago Martin Pool - Skip symlinks during recursive add (path from aa 1.1 KB Diff Download File
trace.py 949 19 years ago Martin Pool - add back update-hashes command for testing/profi 3.9 KB Diff Download File
tree.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 11.1 KB Diff Download File
upgrade.py 802 19 years ago Martin Pool - Remove XMLMixin class in favour of simple pack_x 5.1 KB Diff Download File
weave.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 26.6 KB Diff Download File
weavefile.py 944 19 years ago Martin Pool - refactor member names in Weave code 3.7 KB Diff Download File
workingtree.py 956 19 years ago Martin Pool doc 9 KB Diff Download File
xml.py 974.1.26 19 years ago aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf 1.3 KB Diff Download File