Merge branch 'hold/svn'

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 626d85493a64d798dedbdc52b2b0f68d56d447fd..90e889c300ab16681040c27ab70c43cd741ff8a0 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -207,7 +207,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
             os.unlink(orig)
             os.unlink(src1)
             os.unlink(src2)
-            
+
             clean = (code == 0)
         else:
             assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode))
@@ -295,6 +295,7 @@ def fileExists(path):
             else:
                 raise
 
+    branch = branch.replace('/', '_')
     newPath = path + '_' + branch
     suffix = 0
     while newPath in currentFileSet or \
@@ -577,13 +578,15 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
                 updateFile(False, ren1.dstSha, ren1.dstMode, dstName1)
                 updateFile(False, ren2.dstSha, ren2.dstMode, dstName2)
             else:
-                print 'Renaming', fmtRename(path, ren1.dstName)
                 [resSha, resMode, clean, merge] = \
                          mergeFile(ren1.srcName, ren1.srcSha, ren1.srcMode,
                                    ren1.dstName, ren1.dstSha, ren1.dstMode,
                                    ren2.dstName, ren2.dstSha, ren2.dstMode,
                                    branchName1, branchName2)
 
+                if merge or not clean:
+                    print 'Renaming', fmtRename(path, ren1.dstName)
+
                 if merge:
                     print 'Auto-merging', ren1.dstName
 
@@ -653,13 +656,15 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB):
                 tryMerge = True
 
             if tryMerge:
-                print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
                 [resSha, resMode, clean, merge] = \
                          mergeFile(ren1.srcName, ren1.srcSha, ren1.srcMode,
                                    ren1.dstName, ren1.dstSha, ren1.dstMode,
                                    ren1.srcName, srcShaOtherBranch, srcModeOtherBranch,
                                    branchName1, branchName2)
 
+                if merge or not clean:
+                    print 'Renaming', fmtRename(ren1.srcName, ren1.dstName)
+
                 if merge:
                     print 'Auto-merging', ren1.dstName