← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_bound_branches.py

  • Committer: Robey Pointer
  • Date: 2006-09-03 00:28:18 UTC
  • mfrom: (1981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060903002818-71ca5c7bfea93a26
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
324
324
        bzr('merge', '../other')
325
325
 
326
326
        self.failUnlessExists('c')
327
 
        tree = WorkingTree.open('.')
328
 
        self.assertEqual([new_rev_id], tree.pending_merges())
 
327
        tree = WorkingTree.open('.') # opens child
 
328
        self.assertEqual([new_rev_id], tree.get_parent_ids()[1:])
329
329
 
330
330
        # Make sure the local branch has the installed revision
331
331
        bzr('cat-revision', new_rev_id)