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 |
3504.2.1 | 17 years ago | John Arbash Meinel | Shortcut iter_references when we know references a | 14.2 KB |
|
|
|
test_annotate_iter.py |
3224.1.28 | 17 years ago | John Arbash Meinel | Add some direct tests for Tree.annotate_iter | 2.2 KB |
|
|
|
test_get_file_mtime.py |
2405.3.1 | 18 years ago | John Arbash Meinel | Add some tests for get_file_mtime, and clean up ot | 1.6 KB |
|
|
|
test_get_root_id.py |
2946.3.4 | 18 years ago | John Arbash Meinel | Comment from Martin: Use 'make_tree_*' not 'get_tr | 1.5 KB |
|
|
|
test_get_symlink_target.py |
2949.5.1 | 18 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 1.7 KB |
|
|
|
test_inv.py |
3350.6.4 | 17 years ago | Robert Collins | First cut at pluralised VersionedFiles. Some rathe | 4 KB |
|
|
|
test_list_files.py |
2255.2.71 | 18 years ago | John Arbash Meinel | Add a test for list_files, and implement it for Di | 2.1 KB |
|
|
|
test_path_content_summary.py |
2776.1.7 | 18 years ago | Robert Collins | * New method on ``bzrlib.tree.Tree`` ``path_conten | 3.9 KB |
|
|
|
test_revision_tree.py |
1908.11.5 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2240 | 1.2 KB |
|
|
|
test_test_trees.py |
3363.2.7 | 17 years ago | Aaron Bentley | Implement alterntative-to-inventory tests | 13.5 KB |
|
|
|
test_tree.py |
3504.2.1 | 17 years ago | John Arbash Meinel | Shortcut iter_references when we know references a | 7.2 KB |
|
|
|
test_walkdirs.py |
2408.1.3 | 18 years ago | Alexander Belchenko | tree_implementations: make usage of symlinks optio | 4.3 KB |
|
|