← 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: Robert Collins
  • Date: 2006-04-12 04:57:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1654.
  • Revision ID: robertc@robertcollins.net-20060412045734-3e03b7af0860a5a9
 * 'pull' and 'push' now normalise the revision history, so that any two
   branches with the same tip revision will have the same output from 'log'.
   (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_bound_sftp.py
226
226
        # by pushing the new change to base
227
227
        wt_child.branch.bind(sftp_b_base)
228
228
 
229
 
        self.assertEqual(['r@b-1', 'r@b-2', 'r@c-3'],
 
229
        self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3'],
230
230
                b_base.revision_history())
231
 
        self.assertEqual(['r@b-1', 'r@b-2', 'r@c-3'],
 
231
        self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3'],
232
232
                wt_child.branch.revision_history())
233
233
 
234
234
    def test_bind_parent_ahead(self):