- Committer: John Arbash Meinel
- Date: 2008-07-11 21:28:36 UTC
- Revision ID: john@arbash-meinel.com-20080711212836-1ehghrnzgaioqwou
Handle more edge cases.
Specifically, we don't have to switch on the whole-ancestry logic until we have
3 or more LCAs, we were doing it when there was 2.
However, when we do switch on the whole ancestry logic, it is possible to
get extra 'tails' which have ancestors that are in the ancestry of the
unique lca, but they themselves do not terminate on the unique lca.
The current code is a bit of a compromise, as we probably should chase down
more nodes to include. If we include more than 1 lca, then we run into the
same problem, where common lines have to have one side 'win' and the other 'lose'.
A different possibility would be to create an artificial ancestor node,
which uses the common lines from the different LCAs, so that it is assumed they
all come from the same source. This would end up ignoring cases where changes
were reverted and then reintroduced.
Specifically, we don't have to switch on the whole-ancestry logic until we have
3 or more LCAs, we were doing it when there was 2.
However, when we do switch on the whole ancestry logic, it is possible to
get extra 'tails' which have ancestors that are in the ancestry of the
unique lca, but they themselves do not terminate on the unique lca.
The current code is a bit of a compromise, as we probably should chase down
more nodes to include. If we include more than 1 lca, then we run into the
same problem, where common lines have to have one side 'win' and the other 'lose'.
A different possibility would be to create an artificial ancestor node,
which uses the common lines from the different LCAs, so that it is assumed they
all come from the same source. This would end up ignoring cases where changes
were reverted and then reintroduced.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
3453.5.1 | 16 years ago | Andrew Bennetts | Add {bzrdir,repository,branch}_implementations tes | 8.2 KB |
|
|
|
test_bound_sftp.py |
1551.15.71 | 17 years ago | Aaron Bentley | Fix test case that was importing merge when it did | 12.8 KB |
|
|
|
test_branch.py |
3350.6.12 | 16 years ago | Martin Pool | merge trunk; remove RemoteToOtherFetcher | 28.7 KB |
|
|
|
test_break_lock.py |
3015.2.4 | 17 years ago | Robert Collins | Handle repositories that cannot be remotely locked | 3.6 KB |
|
|
|
test_check.py |
3489.2.4 | 16 years ago | Andrew Bennetts | Fix all tests broken by fixing make_branch_and_tre | 2.8 KB |
|
|
|
test_commit.py |
3256.2.18 | 16 years ago | Daniel Watkins | Updated uses of Hooks.install_hook to Hooks.instal | 8.8 KB |
|
|
|
test_create_checkout.py |
3044.1.1 | 17 years ago | Martin Pool | Fix up calls to TestCase.build_tree passing a stri | 2.6 KB |
|
|
|
test_get_revision_id_to_revno_map.py |
2978.7.1 | 17 years ago | John Arbash Meinel | Fix bug #162486, by having RemoteBranch properly i | 4.6 KB |
|
|
|
test_hooks.py |
3256.2.26 | 16 years ago | Daniel Watkins | Updated tests to use install_named_hook. | 6.4 KB |
|
|
|
test_http.py |
3102.1.1 | 17 years ago | Vincent Ladeuil | Rename bzrlib/test/HTTPTestUtils.py to bzrlib/test | 3.5 KB |
|
|
|
test_last_revision_info.py |
2249.4.1 | 17 years ago | Wouter van Heyst | New Branch.last_revision_info method, this is bein | 1.4 KB |
|
|
|
test_locking.py |
3015.2.15 | 17 years ago | Robert Collins | Review feedback. | 20.9 KB |
|
|
|
test_parent.py |
3139.2.1 | 17 years ago | Alexander Belchenko | bugfix #90847: fix problem with parent location on | 3.6 KB |
|
|
|
test_permissions.py |
3416.2.5 | 16 years ago | Martin Pool | Correction to branch permissions test | 3.5 KB |
|
|
|
test_pull.py |
3482.1.2 | 16 years ago | John Arbash Meinel | remove the bogus pdb line | 9.3 KB |
|
|
|
test_push.py |
3449.1.2 | 16 years ago | Andrew Bennetts | Add test and NEWS entry. | 10.9 KB |
|
|
|
test_reconcile.py |
3489.2.4 | 16 years ago | Andrew Bennetts | Fix all tests broken by fixing make_branch_and_tre | 2.9 KB |
|
|
|
test_revision_history.py |
3495.2.1 | 16 years ago | Aaron Bentley | Tolerate ghosts in mainline (#235055) | 8.6 KB |
|
|
|
test_revision_id_to_revno.py |
2598.5.3 | 17 years ago | Aaron Bentley | Push NULL_REVISION deeper | 1.6 KB |
|
|
|
test_sprout.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 3.9 KB |
|
|
|
test_tags.py |
2388.1.12 | 17 years ago | Alexander Belchenko | direct test for tags.get_reverse_tag_dict() | 7 KB |
|
|
|
test_uncommit.py |
3256.2.16 | 16 years ago | Daniel Watkins | Updated uses of Hooks.install_hook to Hooks.instal | 3.9 KB |
|
|
|
test_update.py |
3445.1.8 | 16 years ago | John Arbash Meinel | Clarity tweaks recommended by Ian | 4.7 KB |
|
|