To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2008-07-09 21:42:24 UTC
- Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
| 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 |
2817.4.3 | 17 years ago | Vincent Ladeuil | Add tests for commit, reuse master branch transpor | 2.1 KB |
|
|
|
test_init.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.1 KB |
|
|
|
test_init_repository.py |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.1 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 |
2814.11.1 | 17 years ago | Vincent Ladeuil | Renamed install_hooks to start_logging_connections | 1.1 KB |
|
|
|
test_update.py |
2817.4.2 | 17 years ago | Vincent Ladeuil | Fix broken test. * bzrlib/tests/commands/test_upd | 1.4 KB |
|
|