← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Marius Kruger
  • Date: 2007-06-27 18:48:10 UTC
  • mfrom: (2557 +trunk)
  • mto: (2605.1.1 rm-renamed)
  • mto: This revision was merged to the branch mainline in revision 2609.
  • Revision ID: marius.kruger@enerweb.co.za-20070627184810-4jq1y5f20xafow9w
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
77
77
        wt1.add('bar')
78
78
        wt1.commit('add foobar')
79
79
        os.chdir('branch2')
80
 
        self.run_bzr('merge', '../branch1/baz', retcode=3)
81
 
        self.run_bzr('merge', '../branch1/foo')
 
80
        self.run_bzr('merge ../branch1/baz', retcode=3)
 
81
        self.run_bzr('merge ../branch1/foo')
82
82
        self.failUnlessExists('foo')
83
83
        self.failIfExists('bar')
84
84
        wt2 = WorkingTree.open('.') # opens branch2