- 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. | 6.4 KB |
|
|
|
test_add.py |
2323.3.3 | 18 years ago | Robert Collins | Merge Martins 0.15rc2 release branch. | 6.6 KB |
|
|
|
test_add_reference.py |
3376.2.4 | 17 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 4.4 KB |
|
|
|
test_basis_inventory.py |
3407.2.14 | 16 years ago | Martin Pool | Remove more cases of getting transport via control | 3.3 KB |
|
|
|
test_basis_tree.py |
2255.2.72 | 18 years ago | John Arbash Meinel | Add some tests for WorkingTree.basis_tree() | 2.9 KB |
|
|
|
test_break_lock.py |
3015.2.11 | 17 years ago | Robert Collins | Handle repositories that do not physically lock in | 3.1 KB |
|
|
|
test_changes_from.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.2 KB |
|
|
|
test_commit.py |
3256.2.26 | 17 years ago | Daniel Watkins | Updated tests to use install_named_hook. | 22.5 KB |
|
|
|
test_executable.py |
2911.5.4 | 17 years ago | John Arbash Meinel | Switch around to properly look up the executable b | 7.3 KB |
|
|
|
test_flush.py |
2052.3.10 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 2.6 KB |
|
|
|
test_get_file_mtime.py |
2405.3.2 | 18 years ago | John Arbash Meinel | Fix one test. | 3.3 KB |
|
|
|
test_get_parent_ids.py |
2249.5.7 | 18 years ago | John Arbash Meinel | Make sure WorkingTree revision_ids are also return | 2.5 KB |
|
|
|
test_inv.py |
3146.8.5 | 17 years ago | Aaron Bentley | Get apply_inventory_delta kinda working, but not c | 6.2 KB |
|
|
|
test_is_control_filename.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 1.7 KB |
|
|
|
test_is_ignored.py |
2696.1.1 | 17 years ago | Martin Pool | Remove things deprecated in 0.11 and earlier | 8.4 KB |
|
|
|
test_locking.py |
3287.4.3 | 17 years ago | Martin Pool | Remove redundant reduceLockdirTimeout calls | 11.5 KB |
|
|
|
test_merge_from_branch.py |
3254.1.1 | 17 years ago | Aaron Bentley | Make Tree.iter_changes a public method | 4.8 KB |
|
|
|
test_mkdir.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.3 KB |
|
|
|
test_move.py |
2456.2.1 | 18 years ago | John Arbash Meinel | (broken) Add a (failing) test that _iter_changes w | 23.1 KB |
|
|
|
test_nested_specifics.py |
1551.10.26 | 18 years ago | Aaron Bentley | Allow extract when tree is locked | 1.9 KB |
|
|
|
test_parents.py |
3462.1.2 | 16 years ago | John Arbash Meinel | Change WT.set_parent_(ids/trees) to filter out anc | 32.1 KB |
|
|
|
test_paths2ids.py |
2255.2.104 | 18 years ago | Robert Collins | Add WorkingTree4.paths2ids which is inventory-usag | 7.7 KB |
|
|
|
test_pull.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 2.2 KB |
|
|
|
test_put_file.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.5 KB |
|
|
|
test_read_working_inventory.py |
2255.2.45 | 18 years ago | Robert Collins | Dirstate - fix revision_tree() behaviour to match | 1.8 KB |
|
|
|
test_readonly.py |
2255.10.1 | 18 years ago | John Arbash Meinel | Update WorkingTree4 so that it doesn't use a HashC | 4.3 KB |
|
|
|
test_remove.py |
3051 | 17 years ago | Canonical.com Patch Queue Manager | (Lukáš Lalinský) Fix bug #172598 by cleaning up th | 11.9 KB |
|
|
|
test_rename_one.py |
3201.1.2 | 17 years ago | John Arbash Meinel | Test needs to be updated now that µ is allowed. | 13.1 KB |
|
|
|
test_revision_tree.py |
2255.2.76 | 18 years ago | Robert Collins | Add tests for revision trees with a different uniq | 3.8 KB |
|
|
|
test_set_root_id.py |
3400.3.6 | 16 years ago | Martin Pool | Remove code deprecated prior to 1.1 and its tests | 1.9 KB |
|
|
|
test_smart_add.py |
2585.1.1 | 17 years ago | Aaron Bentley | Unify MutableTree.smart_add behavior by disabling | 10.2 KB |
|
|
|
test_uncommit.py |
2598.5.7 | 17 years ago | Aaron Bentley | Updates from review | 1.2 KB |
|
|
|
test_unversion.py |
2946.3.3 | 17 years ago | John Arbash Meinel | Prefer tree.get_root_id() as more explicit than tr | 7.5 KB |
|
|
|
test_walkdirs.py |
3376.2.11 | 16 years ago | Martin Pool | Compare to None using is/is not not == | 9.6 KB |
|
|
|
test_workingtree.py |
3407.2.7 | 16 years ago | Martin Pool | Deprecate LockableFiles.put_utf8 and put_bytes. | 37.8 KB |
|
|