← 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: 2011-06-09 18:56:55 UTC
  • mto: (5954.6.3 795456-eager-test)
  • mto: This revision was merged to the branch mainline in revision 5968.
  • Revision ID: aaron@aaronbentley.com-20110609185655-zw6tk88vlm2e1b7l
Support merging into null tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
668
668
            self.build_tree([f])
669
669
            tree.add(f)
670
670
            tree.commit("added "+f)
671
 
        for context in (".", "", "a"):
672
 
            self.run_bzr("merge -r 1..0 " + context)
 
671
        for context in (".", "", 'a'):
 
672
            retcode = 1 if context == '.' or context == '' else 0
 
673
            self.run_bzr("merge -r 1..0 " + context, retcode=retcode)
673
674
            self.assertPathDoesNotExist("a")
674
675
            tree.revert()
675
676
            self.assertPathExists("a")