mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-03 19:51:31 +02:00
Code

Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.

Browse Source 
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
Simon Hausmann 2007-03-10 21:23:49 +01:00
parent 43cc31e8a2
commit dd87020bd3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/fast-import/p4-fast-export.py
View File

@ -415,6 +415,7 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
for fileName in sourceFiles.keys():
integrations = []
deleted = False
integrationCount = 0
for integration in p4CmdList("integrated \"%s\"" % fileName):
toFile = integration["fromFile"] # yes, it's true, it's fromFile
if not toFile in destinationFiles:
@ -424,10 +425,15 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
# print "file %s has been deleted in %s" % (fileName, toFile)
deleted = True
break
integrationCount += 1
if integration["how"] == "branch from":
continue
if int(integration["change"]) == change:
integrations.append(integration)
continue
if int(integration["change"]) > change:
continue
destRev = int(destFile["rev"])
@ -453,7 +459,7 @@ def changeIsBranchMerge(sourceBranch, destinationBranch, change):
if deleted:
continue
if len(integrations) == 0:
if len(integrations) == 0 and integrationCount > 1:
print "file %s was not integrated from %s into %s" % (fileName, sourceBranch, destinationBranch)
return False