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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
authentication.txt |
3418.5.3 | 17 years ago | Vincent Ladeuil | Fixed as per John's review. | 6.6 KB |
|
|
|
configuration.txt |
3921.2.8 | 16 years ago | Aaron Bentley | Update docs | 11.2 KB |
|
|
|
conflicts.txt |
3144.4.2 | 17 years ago | Aaron Bentley | Handle non-directory parent conflicts (abentley, # | 7.1 KB |
|
|
|
hooks.txt |
3825.2.3 | 16 years ago | Jelmer Vernooij | Move NEWS entry to latest version, update versions | 7.4 KB |
|
|
|
patterns.txt |
3398.1.26 | 17 years ago | Ian Clatworthy | jam feedback - make patterns a separate help topic | 1 KB |
|
|
|
rules.txt |
3946.1.1 | 16 years ago | Ian Clatworthy | Multi-glob rules (Marius Kruger) | 947 bytes |
|
|