← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
514
514
        self.assertEqual(out,
515
515
                         ('','bzr: ERROR: Need working tree for --show-base.\n'))
516
516
 
517
 
 
 
517
    def test_pull_tag_conflicts(self):
 
518
        """pulling tags with conflicts will change the exit code"""
 
519
        # create a branch, see that --show-base fails
 
520
        from_tree = self.make_branch_and_tree('from')
 
521
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
522
        to_tree = self.make_branch_and_tree('to')
 
523
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
 
524
        out = self.run_bzr(['pull','-d','to','from'],retcode=1)
 
525
        self.assertEqual(out,
 
526
            ('No revisions to pull.\nConflicting tags:\n    mytag\n', ''))