merge-recursive: Use '~' instead of '_' to separate file names from branch names

Fredrik Kuivinen · Junio C Hamano · commit e9af60c88bbd · 2005-11-11T21:14:39.000-08:00
Makes it less probable that we get a clash with an existing file,
furthermore Cogito already uses '~' for this purpose.

Signed-off-by: Fredrik Kuivinen &lt;freku045@student.liu.se&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
@@ -304,13 +304,13 @@ def fileExists(path):
                 raise
 
     branch = branch.replace('/', '_')
-    newPath = path + '_' + branch
+    newPath = path + '~' + branch
     suffix = 0
     while newPath in currentFileSet or \
           newPath in currentDirectorySet  or \
           fileExists(newPath):
         suffix += 1
-        newPath = path + '_' + branch + '_' + str(suffix)
+        newPath = path + '~' + branch + '_' + str(suffix)
     currentFileSet.add(newPath)
     return newPath
 
