← 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: Canonical.com Patch Queue Manager
  • Date: 2010-02-03 10:06:19 UTC
  • mfrom: (4999.3.2 apport)
  • Revision ID: pqm@pqm.ubuntu.com-20100203100619-f76bo5y5bd5c14wk
(mbp) use apport to send bugs, not just store them

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')
59
58
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
60
 
        other_tree.commit('mergeable commit')
 
59
        self.build_tree(['other/file'])
 
60
        other_tree.add('file')
 
61
        other_tree.commit('added file')
61
62
        self.tree.merge_from_branch(other_tree.branch)
62
63
        self.assertTrue(self.tree.has_changes())