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

  • Committer: Vincent Ladeuil
  • Date: 2007-09-17 21:08:47 UTC
  • mfrom: (2828 +trunk)
  • mto: (2851.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2852.
  • Revision ID: v.ladeuil+lp@free.fr-20070917210847-hneglal34t75toin
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
164
164
        # test implicit --remember when no parent set, this merge conflicts
165
165
        self.build_tree(['d'])
166
166
        tree_b.add('d')
167
 
        out = self.run_bzr('merge ../branch_a', retcode=3)
168
 
        self.assertEquals(out,
169
 
                ('','bzr: ERROR: Working tree has uncommitted changes.\n'))
 
167
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
 
168
                           'merge ../branch_a')
170
169
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
171
170
        # test implicit --remember after resolving conflict
172
171
        tree_b.commit('commit d')