← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-05-13 07:58:34 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060513075834-9073c2493d16ab99
Get changeset merges closer to working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
189
189
        f.close()
190
190
        tree_b.commit('message')
191
191
        os.chdir('branch_b')
192
 
        file('cset', 'wb').write(self.runbzr('changeset ../branch_a')[0])
 
192
        file('../cset', 'wb').write(self.runbzr('changeset ../branch_a')[0])
 
193
        os.chdir('../branch_a')
 
194
        self.runbzr('merge ../cset')