diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-11-09 11:36:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-09 12:32:34 -0800 |
| commit | c8a4f5e5422677b950e7e74b29fa6631fd8ce243 (patch) | |
| tree | b5b83a60c9e24d15a06697f67734bdb858e2ddc0 | |
| parent | e09f5d7b07ada67f9e9c25ba7e58d76b8d5f4253 (diff) | |
| download | git-c8a4f5e5422677b950e7e74b29fa6631fd8ce243.tar.gz git-c8a4f5e5422677b950e7e74b29fa6631fd8ce243.tar.xz | |
merge-recursive: Fix limited output of rename messages
The previous code did the right thing, but it did it by accident.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-merge-recursive.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 9983cd9de..36578754c 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -162,13 +162,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name): # Low level file merging, update and removal # ------------------------------------------ -MERGE_NONE = 0 -MERGE_TRIVIAL = 1 -MERGE_3WAY = 2 def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, branch1Name, branch2Name): - merge = MERGE_NONE + merge = False clean = True if stat.S_IFMT(aMode) != stat.S_IFMT(bMode): @@ -181,7 +178,7 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, sha = bSha else: if aSha != oSha and bSha != oSha: - merge = MERGE_TRIVIAL + merge = True if aMode == oMode: mode = bMode @@ -211,7 +208,6 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, os.unlink(src1) os.unlink(src2) - merge = MERGE_3WAY clean = (code == 0) else: assert(stat.S_ISLNK(aMode) and stat.S_ISLNK(bMode)) @@ -590,7 +586,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB): if merge or not clean: print 'Renaming', fmtRename(path, ren1.dstName) - if merge == MERGE_3WAY: + if merge: print 'Auto-merging', ren1.dstName if not clean: @@ -668,7 +664,7 @@ def processRenames(renamesA, renamesB, branchNameA, branchNameB): if merge or not clean: print 'Renaming', fmtRename(ren1.srcName, ren1.dstName) - if merge == MERGE_3WAY: + if merge: print 'Auto-merging', ren1.dstName if not clean: |