← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_bound_sftp.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/branch_implementations/test_bound_sftp.py
200
200
 
201
201
        wt_child.branch.unbind()
202
202
        open('child/a', 'ab').write('child contents\n')
203
 
        wt_child.commit('child', rev_id='r@c-2')
 
203
        wt_child_rev = wt_child.commit('child', rev_id='r@c-2')
204
204
 
205
205
        self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
206
206
        self.assertEqual(['r@b-1'], b_base.revision_history())
224
224
        #       work, you have to use list notation
225
225
        merge((sftp_b_base.base, 2), [None, None], this_dir=wt_child.branch.base)
226
226
 
227
 
        self.assertEqual(['r@b-2'], wt_child.pending_merges())
 
227
        self.assertEqual([wt_child_rev, 'r@b-2'], wt_child.get_parent_ids())
228
228
        wt_child.commit('merged', rev_id='r@c-3')
229
229
 
230
230
        # After a merge, trying to bind again should succeed
323
323
        merge((wt_other.branch.base, 2), [None, None], this_dir=wt_child.branch.base)
324
324
 
325
325
        self.failUnlessExists('child/c')
326
 
        self.assertEqual(['r@d-2'], wt_child.pending_merges())
 
326
        self.assertEqual(['r@d-2'], wt_child.get_parent_ids()[1:])
327
327
        self.failUnless(wt_child.branch.repository.has_revision('r@d-2'))
328
328
        self.failIf(b_base.repository.has_revision('r@d-2'))
329
329