/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/per_branch/test_branch.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
    branch as _mod_bzrbranch,
39
39
    remote,
40
40
    )
 
41
from breezy.sixish import (
 
42
    text_type,
 
43
    )
41
44
from breezy.tests import (
42
45
    per_branch,
43
46
    )
281
284
        branch = self.make_branch('bzr.dev')
282
285
        # An implicit nick name is set; what it is exactly depends on the
283
286
        # format.
284
 
        self.assertIsInstance(branch.nick, basestring)
 
287
        self.assertIsInstance(branch.nick, text_type)
285
288
        # Set the branch nick explicitly.
286
 
        branch.nick = "Aaron's branch"
 
289
        branch.nick = u"Aaron's branch"
287
290
        # Because the nick has been set explicitly, the nick is now always
288
291
        # "Aaron's branch".
289
 
        self.assertEqual(branch.nick, "Aaron's branch")
 
292
        self.assertEqual(branch.nick, u"Aaron's branch")
290
293
        branch.nick = u"\u1234"
291
294
        self.assertEqual(branch.nick, u"\u1234")
292
295
 
1025
1028
        checkout.commit('bar')
1026
1029
        tree.lock_write()
1027
1030
        self.addCleanup(tree.unlock)
1028
 
        merger = merge.Merger.from_revision_ids(None, tree,
 
1031
        merger = merge.Merger.from_revision_ids(tree,
1029
1032
                                                branch.last_revision(),
1030
1033
                                                other_branch=branch)
1031
1034
        merger.merge_type = merge.Merge3Merger