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

  • Committer: Robert Collins
  • Date: 2007-11-18 19:56:39 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3038.
  • Revision ID: robertc@robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
Merge bzr.dev.

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