← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_tags.py

  • Committer: Martin Pool
  • Date: 2007-02-25 11:11:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
Report conflicting tags from push.
Factor out PushResult.report()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_tags.py
104
104
        self.assertContainsRe(out,
105
105
            u'^\u30d0zaar  *revid-1'.encode('utf-8'))
106
106
 
107
 
    def test_merge_conflicting_tags(self):
108
 
        pass
 
107
    def test_conflicting_tags(self):
 
108
        t1 = self.make_branch_and_tree('one')
 
109
        t2 = self.make_branch_and_tree('two')
 
110
        b1 = t1.branch
 
111
        b2 = t2.branch
 
112
        tagname = u'\u30d0zaar'
 
113
        b1.tags.set_tag(tagname, 'revid1')
 
114
        b2.tags.set_tag(tagname, 'revid2')
 
115
        out, err = self.run_bzr('push', '-d', 'one', 'two', encoding='utf-8')
 
116
        self.assertContainsRe(out,
 
117
                'Conflicting tags:\n.*' + tagname.encode('utf-8'))