/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: Marius Kruger
  • Date: 2007-01-19 09:47:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: amanic@gmail.com-20070119094738-zzjsna2p0lupx92a
* bzrlib/errors.py
  Changed "FilesExist" to more specific "RenameFailedFilesExist"

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
291
291
        os.rename('a', 'b')
292
292
        self.build_tree(['a']) #touch a
293
293
        self.run_bzr_error(
294
 
            ["^bzr: ERROR: Could not rename a => b: Files exist: a b:"
 
294
            ["^bzr: ERROR: Could not rename a to b because both files exist."
295
295
             " \(Use --after to update the Bazaar id\)$"],
296
296
            'mv', 'a', 'b')
297
297
        self.failUnlessExists('a')
342
342
        self.build_tree(['a2']) #touch a2
343
343
 
344
344
        self.run_bzr_error(
345
 
            ["^bzr: ERROR: Could not rename a1 => a1: Files exist: a1 .*a1:"
 
345
            ["^bzr: ERROR: Could not rename a1 to sub/a1 because both files exist."
346
346
             " \(Use --after to update the Bazaar id\)$"],
347
347
            'mv', 'a1', 'a2', 'sub')
348
348
        self.failUnlessExists('a1')