← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
29
29
        tree = self.make_branch_and_tree('a')
30
30
        tree.commit('empty commit')
31
31
        tree2 = self.make_branch_and_tree('b')
32
 
        # set a left most parent
 
32
        # set a left most parent that is not a present commit
33
33
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
34
34
        # do a merge
35
 
        self.merge(tree.branch, tree2)
 
35
        tree2.merge_from_branch(tree.branch)
36
36
        output = StringIO()
37
37
        show_pending_merges(tree2, output)
38
38
        self.assertContainsRe(output.getvalue(), 'empty commit')