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 |
3302.9.27 | 17 years ago | Vincent Ladeuil | Fixed as per Ian's review. | 1.8 KB |
|
|
|
test_branch.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.5 KB |
|
|
|
test_cat.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 2 KB |
|
|
|
test_checkout.py |
2955.5.1 | 17 years ago | Vincent Ladeuil | Reproduce bug 159150. * tests/commands/test_check | 1.4 KB |
|
|
|
test_commit.py |
3815.3.4 | 16 years ago | Marius Kruger | When doing a `commit --local`, don't try to connec | 2.5 KB |
|
|
|
test_init.py |
3535.9.3 | 17 years ago | Marius Kruger | init/init-repo shouldn't open 2 connections | 1.2 KB |
|
|
|
test_init_repository.py |
3535.9.3 | 17 years ago | Marius Kruger | init/init-repo shouldn't open 2 connections | 1.3 KB |
|
|
|
test_merge.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.4 KB |
|
|
|
test_missing.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.3 KB |
|
|
|
test_pull.py |
2817.4.3 | 17 years ago | Vincent Ladeuil | Add tests for commit, reuse master branch transpor | 2 KB |
|
|
|
test_push.py |
3928.3.2 | 16 years ago | John Arbash Meinel | Track down the other cause of us connecting multip | 1.6 KB |
|
|
|
test_update.py |
2817.4.2 | 17 years ago | Vincent Ladeuil | Fix broken test. * bzrlib/tests/commands/test_upd | 1.4 KB |
|
|