← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tag.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tag.py
111
111
        # conflicting merge
112
112
        a.tags.set_tag('tag-2', 'z')
113
113
        conflicts = a.tags.merge_to(b.tags)
114
 
        self.assertEqual(list(conflicts), [('tag-2', 'z', 'y')])
 
114
        self.assertEqual(conflicts, [('tag-2', 'z', 'y')])
115
115
        self.assertEqual('y', b.tags.lookup_tag('tag-2'))
116
116
        # overwrite conflicts
117
117
        conflicts = a.tags.merge_to(b.tags, overwrite=True)
118
 
        self.assertEqual(list(conflicts), [])
 
118
        self.assertEqual(conflicts, [])
119
119
        self.assertEqual('z', b.tags.lookup_tag('tag-2'))
120
120
 
121
121
 
122
122
class TestTagsInCheckouts(TestCaseWithTransport):
123
 
    """Tests for how tags are synchronised between the master and child branch
124
 
    of a checkout.
125
 
    """
126
123
 
127
124
    def test_update_tag_into_checkout(self):
128
125
        # checkouts are directly connected to the tags of their master branch: