← 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: Canonical.com Patch Queue Manager
  • Date: 2007-07-31 12:22:44 UTC
  • mfrom: (1551.15.77 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
Clean up merge command, support arbitrary revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_bound_sftp.py
195
195
        self.assertEqual(['r@b-1'], sftp_b_newbase.revision_history())
196
196
 
197
197
    def test_bind_diverged(self):
198
 
        from bzrlib.builtins import merge
199
 
 
200
198
        b_base, wt_child = self.create_branches()
201
199
 
202
200
        wt_child.branch.unbind()
286
284
        self.assertEqual(['r@b-1'], b_base.revision_history())
287
285
 
288
286
    def test_commit_after_merge(self):
289
 
        from bzrlib.builtins import merge
290
 
 
291
287
        b_base, wt_child = self.create_branches()
292
288
 
293
289
        # We want merge to be able to be a local only