← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_pull.py
16
16
 
17
17
"""Tests for InterBranch.pull behaviour."""
18
18
 
 
19
import os
 
20
 
19
21
from bzrlib.branch import Branch
20
22
from bzrlib.bzrdir import BzrDir
21
23
from bzrlib import errors
77
79
        other = self.sprout_to(master_tree.branch.bzrdir, 'other').open_branch()
78
80
        # move the branch out of the way on disk to cause a connection
79
81
        # error.
80
 
        master_tree.branch.bzrdir.destroy_branch()
 
82
        os.rename('master', 'master_gone')
81
83
        # try to pull, which should raise a BoundBranchConnectionFailure.
82
84
        self.assertRaises(errors.BoundBranchConnectionFailure,
83
85
                checkout.branch.pull, other)
97
99
        self.assertEqual('P1', result.old_revid)
98
100
        self.assertEqual(2, result.new_revno)
99
101
        self.assertEqual('M1', result.new_revid)
100
 
        self.assertEqual([], result.tag_conflicts)
 
102
        self.assertEqual(None, result.tag_conflicts)
101
103
 
102
104
    def test_pull_overwrite(self):
103
105
        tree_a = self.make_from_branch_and_tree('tree_a')