/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2006-09-04 08:00:48 UTC
  • mfrom: (1979.2.1 merge_from_branch)
  • mto: This revision was merged to the branch mainline in revision 1982.
  • Revision ID: robertc@robertcollins.net-20060904080048-aff24d32f888b21d
(robertc) integrate merge_from_branch patch: adds a convenience method "merge_from_branch" to WorkingTree.

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('..')