← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.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/blackbox/test_commit.py
187
187
            other_tree.commit('modify all sample files and dirs.')
188
188
        finally:
189
189
            other_tree.unlock()
190
 
        self.merge(other_tree.branch, this_tree)
 
190
        this_tree.merge_from_branch(other_tree.branch)
191
191
        os.chdir('this')
192
192
        out,err = self.run_bzr("commit", "-m", "added")
193
193
        os.chdir('..')