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 |
1887.1.1 | 19 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 1 KB |
|
|
|
autodoc_bash_completion.py |
1861.2.8 | 19 years ago | Alexander Belchenko | More branding: bazaar-ng -> Bazaar; bazaar-ng.org | 1.5 KB |
|
|
|
autodoc_man.py |
3709.2.1 | 16 years ago | James Westby | Make the first line of the manpage preamble a comm | 6.5 KB |
|
|
|
autodoc_rstx.py |
3565.2.1 | 17 years ago | Christophe Troestler | (trivial) Corrected typos. | 5.8 KB |
|
|