/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_pull.py

  • Committer: Daniel Watkins
  • Date: 2007-08-21 13:52:55 UTC
  • mto: (2767.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 2768.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070821135255-tgicf49ud4jr7fk4
Now use internal merging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
84
84
        overwritten = Branch.open('.')
85
85
        self.assertEqual(overwritten.revision_history(),
86
86
                         a.revision_history())
87
 
        os.chdir('../a')
88
 
        self.run_bzr('merge ../b')
 
87
        a_tree.merge_from_branch(b_tree.branch)
89
88
        a_tree.commit(message="blah4", allow_pointless=True)
90
89
        os.chdir('../b/subdir')
91
90
        self.run_bzr('pull ../../a')