← 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: Jonathan Riddell
  • Date: 2011-09-20 13:31:00 UTC
  • mto: This revision was merged to the branch mainline in revision 6153.
  • Revision ID: jriddell@canonical.com-20110920133100-kpsomvcnjoxv6n6b
syntax fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
543
543
        out = self.run_bzr(['pull', '-d', 'to', 'from'])
544
544
        self.assertEqual(out,
545
545
            ('1 tag(s) updated.\n', ''))
546
 
 
547
 
    def test_pull_tag_overwrite(self):
548
 
        """pulling tags with --overwrite only reports changed tags."""
549
 
        # create a branch, see that --show-base fails
550
 
        from_tree = self.make_branch_and_tree('from')
551
 
        from_tree.branch.tags.set_tag("mytag", "somerevid")
552
 
        to_tree = self.make_branch_and_tree('to')
553
 
        to_tree.branch.tags.set_tag("mytag", "somerevid")
554
 
        out = self.run_bzr(['pull', '--overwrite', '-d', 'to', 'from'])
555
 
        self.assertEqual(out,
556
 
            ('No revisions or tags to pull.\n', ''))