Part of bzrlib.tests.per_branch.test_tags View In Hierarchy
In particular this exercises variations in tag conflicts in the master branch and/or the checkout (child). It may seem strange to have different tags in the child and master, but 'bzr merge' intentionally updates the child and not the master (instead the next 'bzr commit', if the user decides to commit, will update the master). Also, merge_to in bzr < 2.3 didn't propagate changes to the master, and current bzr versions may find themselves operating on checkouts touched by older bzrs
So we need to make sure bzr copes gracefully with differing tags in the master versus the child.
See also <https://bugs.launchpad.net/bzr/+bug/603395>.
Method | setUp | Undocumented |
Method | test_merge_to_propagates_tags | merge_to(child) also merges tags to the master. |
Method | test_ignore_master_disables_tag_propagation | merge_to(child, ignore_master=True) does not merge tags to the |
Method | test_merge_to_overwrite_conflict_in_master | merge_to(child, overwrite=True) overwrites any conflicting tags in |
Method | test_merge_to_overwrite_conflict_in_child_and_master | merge_to(child, overwrite=True) overwrites any conflicting tags in |
Method | test_merge_to_conflict_in_child_only | When new_tags.merge_to(child.tags) conflicts with the child but not |
Method | test_merge_to_conflict_in_master_only | When new_tags.merge_to(child.tags) conflicts with the master but not |
Method | test_merge_to_same_conflict_in_master_and_child | When new_tags.merge_to(child.tags) conflicts the same way with the |
Method | test_merge_to_different_conflict_in_master_and_child | When new_tags.merge_to(child.tags) conflicts differently in the |
Inherited from TestCaseWithBranch:
Method | get_branch | Undocumented |
Method | get_default_format | Undocumented |
Method | make_branch | Undocumented |
Method | create_tree_with_merge | Create a branch with a simple ancestry. |