To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2009-01-23 21:06:48 UTC
- mto: (3966.1.1 bzr.integration)
- Revision ID: v.ladeuil+lp@free.fr-20090123210648-yfb39g22yyo83d3y
Slight refactoring and test fixing.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.
* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.
* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.
* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
serializer
|
1185.82.3 | 19 years ago | John Arbash Meinel | Working on creating a factor for serializing chang |
|
||
__init__.py |
3224.5.38 | 16 years ago | Andrew Bennetts | Merge from bzr.dev; resolve osutils.py conflict by | 3.7 KB |
|
|
|
apply_bundle.py |
2520.4.6 | 18 years ago | Aaron Bentley | Get installation started | 2.8 KB |
|
|
|
bundle_data.py |
3668.5.4 | 16 years ago | Jelmer Vernooij | Eliminate more uses of Repository.revision_tree(No | 28.6 KB |
|
|
|
commands.py |
3221.1.6 | 17 years ago | Martin Pool | Better error message from bundle-info | 3.8 KB |
|
|