- 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 |
3251.6.5 | 16 years ago | John Arbash Meinel | merge bzr.dev, resolve NEWS | 6.4 KB |
|
|
|
test_add.py |
2664.3.1 | 17 years ago | Daniel Watkins | tests.blackbox.test_add now uses internals where a | 8.4 KB |
|
|
|
test_added.py |
3251.6.4 | 16 years ago | John Arbash Meinel | minor cleanups | 2.2 KB |
|
|
|
test_alias.py |
2900.3.11 | 16 years ago | Tim Penhey | Fixed the output in the tests. | 2.6 KB |
|
|
|
test_aliases.py |
2664.6.2 | 17 years ago | Daniel Watkins | tests.blackbox.test_aliases now uses internals whe | 2.5 KB |
|
|
|
test_ancestry.py |
2664.6.3 | 17 years ago | Daniel Watkins | tests.blackbox.test_ancestry now uses internals wh | 4.3 KB |
|
|
|
test_annotate.py |
3146.2.1 | 17 years ago | Lukáš Lalinský | Don't require a working tree in cmd_annotate. | 6.3 KB |
|
|
|
test_bound_branches.py |
3099.1.1 | 17 years ago | John Arbash Meinel | Fix bug #175337, bzr bind shouldn't check the ance | 13.2 KB |
|
|
|
test_branch.py |
3407.2.14 | 16 years ago | Martin Pool | Remove more cases of getting transport via control | 4.7 KB |
|
|
|
test_break_lock.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4 KB |
|
|
|
test_breakin.py |
2485.8.48 | 17 years ago | Vincent Ladeuil | merge bzr.dev @ 2540 | 3.4 KB |
|
|
|
test_bundle_info.py |
3221.1.6 | 16 years ago | Martin Pool | Better error message from bundle-info | 2 KB |
|
|
|
test_cat.py |
3063.4.2 | 17 years ago | John Arbash Meinel | Fix 'nonexistent' | 4.9 KB |
|
|
|
test_cat_revision.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 2.1 KB |
|
|
|
test_check.py |
2929.2.3 | 17 years ago | Robert Collins | Review feedback. | 1.1 KB |
|
|
|
test_checkout.py |
3136.1.3 | 17 years ago | Aaron Bentley | Implement hard-link support for branch and checkou | 6.3 KB |
|
|
|
test_command_encoding.py |
2830.2.3 | 17 years ago | Martin Pool | Fix up test_command_encoding to expect to see the | 3.8 KB |
|
|
|
test_commit.py |
3099.2.1 | 17 years ago | John Arbash Meinel | Allow 'bzr commit --author' to take a unicode stri | 24 KB |
|
|
|
test_conflicts.py |
2738.4.5 | 17 years ago | Daniel Watkins | Fixed whitespace issues. | 4.2 KB |
|
|
|
test_debug.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 1.6 KB |
|
|
|
test_diff.py |
3164.1.1 | 17 years ago | Ian Clatworthy | diff without arguments means the current tree, not | 15 KB |
|
|
|
test_exceptions.py |
3092.2.1 | 17 years ago | Martin Pool | Ask people to report bugs to Launchpad, and mentio | 2.8 KB |
|
|
|
test_export.py |
3408.7.1 | 16 years ago | Martin Pool | Support tarball export to stdout | 8.9 KB |
|
|
|
test_find_merge_base.py |
2664.5.2 | 17 years ago | Aaron Bentley | Fix up imports | 1.5 KB |
|
|
|
test_help.py |
2743.2.6 | 17 years ago | Daniel Watkins | Cleaned up indentation in test. | 5.5 KB |
|
|
|
test_hooks.py |
3256.2.27 | 16 years ago | Daniel Watkins | Fixed failing test. | 1.9 KB |
|
|
|
test_ignore.py |
3102.1.1 | 17 years ago | Vincent Ladeuil | Rename bzrlib/test/HTTPTestUtils.py to bzrlib/test | 5.5 KB |
|
|
|
test_ignored.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.6 KB |
|
|
|
test_info.py |
3350.6.4 | 16 years ago | Robert Collins | First cut at pluralised VersionedFiles. Some rathe | 37.9 KB |
|
|
|
test_init.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 6.7 KB |
|
|
|
test_inventory.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.3 KB |
|
|
|
test_join.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.9 KB |
|
|
|
test_locale.py |
2768.1.8 | 17 years ago | Ian Clatworthy | Get test suite fully working again | 2.9 KB |
|
|
|
test_log.py |
3170.3.4 | 17 years ago | John Arbash Meinel | Update the tests for the new revision numbering. | 17.4 KB |
|
|
|
test_logformats.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.4 KB |
|
|
|
test_ls.py |
3382.2.4 | 16 years ago | Jerad Cramp | Removed incorrect test. | 8.4 KB |
|
|
|
test_lsprof.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.2 KB |
|
|
|
test_merge.py |
3254.1.1 | 16 years ago | Aaron Bentley | Make Tree.iter_changes a public method | 21.3 KB |
|
|
|
test_merge_directive.py |
2898.2.3 | 17 years ago | James Henstridge | * Fix merge-directive blackbox test. * Fix small t | 10.1 KB |
|
|
|
test_missing.py |
3427.3.8 | 16 years ago | John Arbash Meinel | Change the output to 'This branch' and 'Other bran | 5.8 KB |
|
|
|
test_modified.py |
3251.6.6 | 16 years ago | John Arbash Meinel | Fix the line endings of bzrlib.tests.blackbox.test | 2.4 KB |
|
|
|
test_mv.py |
3249.4.1 | 16 years ago | Alexander Belchenko | merge Lukas' patch and update it with case-insensi | 15.7 KB |
|
|
|
test_nick.py |
2664.11.1 | 17 years ago | Daniel Watkins | tests.blackbox.test_nick now uses internals where | 1.5 KB |
|
|
|
test_non_ascii.py |
3251.6.3 | 16 years ago | Adrian Wilkins | Simplified and fixed test code * non_ascii tests | 19.6 KB |
|
|
|
test_outside_wt.py |
3199.1.3 | 16 years ago | Vincent Ladeuil | Fix two more leaked tmp dirs. * bzrlib/tests/blac | 2.9 KB |
|
|
|
test_pack.py |
2604.2.1 | 17 years ago | Robert Collins | (robertc) Introduce a pack command. | 1.5 KB |
|
|
|
test_pull.py |
3251.4.12 | 16 years ago | Aaron Bentley | Updates from review | 12.9 KB |
|
|
|
test_push.py |
3256.1.4 | 16 years ago | Daniel Watkins | Added test to ensure that passing a range of revis | 13.2 KB |
|
|
|
test_re_sign.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3 KB |
|
|
|
test_reconcile.py |
3389.2.8 | 16 years ago | John Arbash Meinel | Update some tests to pass with the branch checks. | 3.3 KB |
|
|
|
test_reconfigure.py |
3311.2.6 | 16 years ago | Aaron Bentley | rename 'sharing' to 'use-shared' | 3.5 KB |
|
|
|
test_remerge.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.5 KB |
|
|
|
test_remove.py |
3042.2.1 | 17 years ago | Lukáš Lalinský | Fix ``bzr rm`` to not delete modified and ignored | 7.8 KB |
|
|
|
test_remove_tree.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.9 KB |
|
|
|
test_revert.py |
2851.2.1 | 17 years ago | Martin Pool | Add revert --forget-merges | 7.2 KB |
|
|
|
test_revision_history.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 2.9 KB |
|
|
|
test_revision_info.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 3.3 KB |
|
|
|
test_revno.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.5 KB |
|
|
|
test_selftest.py |
3302.11.7 | 16 years ago | Vincent Ladeuil | merge bzr.dev, fixing simple conflicts | 23.7 KB |
|
|
|
test_send.py |
3251.1.2 | 16 years ago | Jelmer Vernooij | ``bzr send`` now supports new ``child_submit_to`` | 10.9 KB |
|
|
|
test_serve.py |
3431.3.7 | 16 years ago | Andrew Bennetts | Fix incidental breakage in blackbox/test_serve.py | 9 KB |
|
|
|
test_shared_repository.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.7 KB |
|
|
|
test_sign_my_commits.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.8 KB |
|
|
|
test_split.py |
3113.6.5 | 17 years ago | Aaron Bentley | Update tests | 2.6 KB |
|
|
|
test_status.py |
3377.3.41 | 16 years ago | John Arbash Meinel | Fix up a couple of the tests | 16.9 KB |
|
|
|
test_switch.py |
3246.5.1 | 16 years ago | Robert Collins | * ``bzr switch`` will attempt to find branches to | 2.6 KB |
|
|
|
test_tags.py |
2805.8.6 | 17 years ago | Adeodato Simó | Don't sort by revno; only by time if --sort=time i | 7.9 KB |
|
|
|
test_testament.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.7 KB |
|
|
|
test_too_much.py |
3102.1.1 | 17 years ago | Vincent Ladeuil | Rename bzrlib/test/HTTPTestUtils.py to bzrlib/test | 23 KB |
|
|
|
test_uncommit.py |
3462.1.4 | 16 years ago | John Arbash Meinel | fix up the uncommit tests now that set_parent_ids | 8.6 KB |
|
|
|
test_unknowns.py |
3251.6.4 | 16 years ago | John Arbash Meinel | minor cleanups | 1.7 KB |
|
|
|
test_update.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 8.6 KB |
|
|
|
test_upgrade.py |
3280.1.1 | 16 years ago | Ian Clatworthy | (Martin Albisetti) Change backup dir from .bzr.bac | 7.8 KB |
|
|
|
test_version.py |
3400.1.1 | 16 years ago | Martin Pool | Fix up stray comment | 4 KB |
|
|
|
test_version_info.py |
3231.2.1 | 16 years ago | James Westby | Make version-info --custom imply --all. When usin | 5.5 KB |
|
|
|
test_versioning.py |
3010.1.16 | 17 years ago | Robert Collins | Lock correctness in test_versioning | 5.6 KB |
|
|
|
test_whoami.py |
2900.2.24 | 17 years ago | Vincent Ladeuil | Review feedback. * doc/en/user-guide/authenticati | 4.6 KB |
|
|