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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.9 KB |
|
|
|
heavily_merged.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|
|
kernel_like.py |
3376.2.4 | 17 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 7.9 KB |
|
|
|
many_commit.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 2.3 KB |
|
|
|
simple_many_commit.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.5 KB |
|
|