Rev 5414: Merge cleanup into orphan-non-versioned-files in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5414 [merge]
revision-id: v.ladeuil+lp at free.fr-20100907130724-45ozcn9rpxfg7lws
parent: v.ladeuil+lp at free.fr-20100907105333-v3lb4p2tnainll1h
parent: v.ladeuil+lp at free.fr-20100907130555-6ocpql16nzjr4808
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Tue 2010-09-07 15:07:24 +0200
message:
  Merge cleanup into orphan-non-versioned-files
modified:
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-09-07 07:48:00 +0000
+++ b/bzrlib/transform.py	2010-09-07 13:07:24 +0000
@@ -2917,7 +2917,7 @@
             try:
                 os.rename(to, from_)
             except OSError, e:
-                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)                
+                raise errors.TransformRenameFailed(to, from_, str(e), e.errno)
         # after rollback, don't reuse _FileMover
         past_renames = None
         pending_deletions = None