← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-13 18:39:31 UTC
  • mfrom: (2967.3.7 85237)
  • Revision ID: pqm@pqm.ubuntu.com-20071113183931-av8ih92ad65slodl
(Daniel Watkins) improve the message when recommending 'move --after', (bug #85237)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
272
272
        self.build_tree(['a']) #touch a
273
273
        self.run_bzr_error(
274
274
            ["^bzr: ERROR: Could not rename a => b because both files exist."
275
 
             " \(Use --after to update the Bazaar id\)$"],
 
275
             " \(Use --after to tell bzr about a rename that has already"
 
276
             " happened\)$"],
276
277
            'mv a b')
277
278
        self.failUnlessExists('a')
278
279
        self.failUnlessExists('b')
320
321
        self.build_tree(['a2']) #touch a2
321
322
 
322
323
        self.run_bzr_error(
323
 
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files exist."
324
 
             " \(Use --after to update the Bazaar id\)$"],
 
324
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files"
 
325
             " exist. \(Use --after to tell bzr about a rename that has already"
 
326
             " happened\)$"],
325
327
            'mv a1 a2 sub')
326
328
        self.failUnlessExists('a1')
327
329
        self.failUnlessExists('a2')