From e9af60c88bbd152ad04640ddb93dc927fc7a10b6 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sat, 12 Nov 2005 00:55:36 +0100 Subject: [PATCH] merge-recursive: Use '~' instead of '_' to separate file names from branch names 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 Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 21f1e924..1bf73f33 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -304,13 +304,13 @@ def uniquePath(path, branch): 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 -- 2.11.0