Rev 4500: Turn test_non_ascii.py test_mv errors into failures. in file:///net/bigmamac.local/Volumes/home/vila/src/bzr/bugs/394190-osx-test-failures/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Jul 1 17:22:36 BST 2009


At file:///net/bigmamac.local/Volumes/home/vila/src/bzr/bugs/394190-osx-test-failures/

------------------------------------------------------------
revno: 4500
revision-id: v.ladeuil+lp at free.fr-20090701162235-uyhpl6kf2zky5iel
parent: v.ladeuil+lp at free.fr-20090701162037-mkf3q98ef53oyzpf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 394190-osx-test-failures
timestamp: Wed 2009-07-01 18:22:35 +0200
message:
  Turn test_non_ascii.py test_mv errors into failures.
  
  * bzrlib/workingtree_4.py:
  (DirStateWorkingTree.move.move_one): from_rel can be in unicode,
  casting to str() is just asking for trouble.
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2009-06-24 22:35:17 +0000
+++ b/bzrlib/workingtree_4.py	2009-07-01 16:22:35 +0000
@@ -716,7 +716,7 @@
             from_entry = self._get_entry(path=from_rel)
             if from_entry == (None, None):
                 raise errors.BzrMoveFailedError(from_rel,to_dir,
-                    errors.NotVersionedError(path=str(from_rel)))
+                    errors.NotVersionedError(path=from_rel))
 
             from_id = from_entry[0][2]
             to_rel = pathjoin(to_dir, from_tail)



More information about the bazaar-commits mailing list