← 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: Canonical.com Patch Queue Manager
  • Date: 2007-09-17 14:29:23 UTC
  • mfrom: (2796.2.18 bzr.reconfigure)
  • Revision ID: pqm@pqm.ubuntu.com-20070917142923-f06edfgw1d0cvj4w
Add reconfigure command

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')