{"thread":{"id":"2462","subject":"[PATCH 3/3] merge-recursive: Use '~' instead of '_' to separate file names from branch names","startedAt":"2005-11-11T23:55:36Z","lastAt":"2005-11-11T23:55:36Z","messageCount":1,"participants":["Fredrik Kuivinen"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"11640","messageId":"20051111235536.GC9757@c165.ib.student.liu.se","threadId":"2462","inReplyTo":null,"subject":"[PATCH 3/3] merge-recursive: Use '~' instead of '_' to separate file names from branch names","fromName":"Fredrik Kuivinen","fromEmail":"freku045@student.liu.se","sentAt":"2005-11-11T23:55:36Z","receivedAt":"2005-11-11T23:55:36Z","isPatch":true,"sender":{"key":"frekui@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13770967?v=4"},"body":"\nMakes it less probable that we get a clash with an existing file,\nfurthermore Cogito already uses '~' for this purpose.\n\nSigned-off-by: Fredrik Kuivinen <freku045@student.liu.se>\n\n\n---\n\n git-merge-recursive.py |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\napplies-to: cd30fe9db68f151066eeadd75eb2fdcb7ff89148\n188d233dddacf754d1b7e8c7154293f9a4668180\ndiff --git a/git-merge-recursive.py b/git-merge-recursive.py\nindex 21f1e92..1bf73f3 100755\n--- a/git-merge-recursive.py\n+++ b/git-merge-recursive.py\n@@ -304,13 +304,13 @@ def uniquePath(path, branch):\n                 raise\n \n     branch = branch.replace('/', '_')\n-    newPath = path + '_' + branch\n+    newPath = path + '~' + branch\n     suffix = 0\n     while newPath in currentFileSet or \\\n           newPath in currentDirectorySet  or \\\n           fileExists(newPath):\n         suffix += 1\n-        newPath = path + '_' + branch + '_' + str(suffix)\n+        newPath = path + '~' + branch + '_' + str(suffix)\n     currentFileSet.add(newPath)\n     return newPath\n \n---\n0.99.9.GIT\n"}]}