← 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: Alexander Belchenko
  • Date: 2007-11-19 22:54:30 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3008.
  • Revision ID: bialix@ukr.net-20071119225430-x0ewosrsagis0yno
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_mv.py
285
285
        self.build_tree(['a']) #touch a
286
286
        self.run_bzr_error(
287
287
            ["^bzr: ERROR: Could not rename a => b because both files exist."
288
 
             " \(Use --after to update the Bazaar id\)$"],
 
288
             " \(Use --after to tell bzr about a rename that has already"
 
289
             " happened\)$"],
289
290
            'mv a b')
290
291
        self.failUnlessExists('a')
291
292
        self.failUnlessExists('b')
333
334
        self.build_tree(['a2']) #touch a2
334
335
 
335
336
        self.run_bzr_error(
336
 
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files exist."
337
 
             " \(Use --after to update the Bazaar id\)$"],
 
337
            ["^bzr: ERROR: Could not rename a1 => sub/a1 because both files"
 
338
             " exist. \(Use --after to tell bzr about a rename that has already"
 
339
             " happened\)$"],
338
340
            'mv a1 a2 sub')
339
341
        self.failUnlessExists('a1')
340
342
        self.failUnlessExists('a2')