Rev 6057: Cosmetic change. in file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

------------------------------------------------------------
revno: 6057
revision-id: v.ladeuil+lp at free.fr-20111026152129-jqfkx8zl3g0735f7
parent: v.ladeuil+lp at free.fr-20111024151509-uo7gww58ssxh4nkz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 880701-resolve-duplicate
timestamp: Wed 2011-10-26 17:21:29 +0200
message:
  Cosmetic change.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2011-07-06 20:52:00 +0000
+++ b/bzrlib/transform.py	2011-10-26 15:21:29 +0000
@@ -3068,7 +3068,7 @@
                 existing_file, new_file = conflict[2], conflict[1]
             else:
                 existing_file, new_file = conflict[1], conflict[2]
-            new_name = tt.final_name(existing_file)+'.moved'
+            new_name = tt.final_name(existing_file) + '.moved'
             tt.adjust_path(new_name, final_parent, existing_file)
             new_conflicts.add((c_type, 'Moved existing file to',
                                existing_file, new_file))