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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
diff |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 45.4 KB |
|
|
|
diff-2 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 270 bytes |
|
|
|
diff-3 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 204 bytes |
|
|
|
diff-4 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 223 bytes |
|
|
|
diff-5 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 4.9 KB |
|
|
|
diff-6 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18.7 KB |
|
|
|
insert_top.patch |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 130 bytes |
|
|
|
mod |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 91.9 KB |
|
|
|
mod-2 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18.1 KB |
|
|
|
mod-3 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18.1 KB |
|
|
|
mod-4 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18 KB |
|
|
|
mod-5 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 13.5 KB |
|
|
|
mod-6 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 22 bytes |
|
|
|
orig |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 97.8 KB |
|
|
|
orig-2 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18 KB |
|
|
|
orig-3 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18.1 KB |
|
|
|
orig-4 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18 KB |
|
|
|
orig-5 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18 KB |
|
|
|
orig-6 |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 18 KB |
|
|
|
patchtext.patch |
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev | 988 bytes |
|
|