b.t.p.t.TestTagsMergeToInCheckouts(per_branch.TestCaseWithBranch) : class documentation

Part of bzrlib.tests.per_branch.test_tags View In Hierarchy

Tests for checkout.branch.tags.merge_to.

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.
def setUp(self):
overrides bzrlib.tests.per_branch.TestCaseWithBranch.setUp
Undocumented
def test_merge_to_propagates_tags(self):
merge_to(child) also merges tags to the master.
def test_ignore_master_disables_tag_propagation(self):
merge_to(child, ignore_master=True) does not merge tags to the master.
def test_merge_to_overwrite_conflict_in_master(self):
merge_to(child, overwrite=True) overwrites any conflicting tags in the master.
def test_merge_to_overwrite_conflict_in_child_and_master(self):
merge_to(child, overwrite=True) overwrites any conflicting tags in both the child and the master.
def test_merge_to_conflict_in_child_only(self):
When new_tags.merge_to(child.tags) conflicts with the child but not the master, a conflict is reported and the child receives the new tag.
def test_merge_to_conflict_in_master_only(self):
When new_tags.merge_to(child.tags) conflicts with the master but not the child, a conflict is reported and the child receives the new tag.
def test_merge_to_same_conflict_in_master_and_child(self):
When new_tags.merge_to(child.tags) conflicts the same way with the master and the child a single conflict is reported.
def test_merge_to_different_conflict_in_master_and_child(self):
When new_tags.merge_to(child.tags) conflicts differently in the master and the child both conflicts are reported.
API Documentation for Bazaar, generated by pydoctor at 2022-06-16 00:25:16.