← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

  • Committer: Patch Queue Manager
  • Date: 2016-01-31 13:36:59 UTC
  • mfrom: (6613.1.5 1538480-match-hostname)
  • Revision ID: pqm@pqm.ubuntu.com-20160131133659-ouy92ee2wlv9xz8m
(vila) Use ssl.match_hostname instead of our own. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
55
55
        self.assertTrue(self.tree.has_changes())
56
56
 
57
57
    def test_with_pending_merges(self):
 
58
        self.tree.commit('first commit')
58
59
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
59
 
        self.build_tree(['other/file'])
60
 
        other_tree.add('file')
61
 
        other_tree.commit('added file')
 
60
        other_tree.commit('mergeable commit')
62
61
        self.tree.merge_from_branch(other_tree.branch)
63
62
        self.assertTrue(self.tree.has_changes())