From: Simon Hausmann <hausmann@kde.org>
Date: Sat, 10 Mar 2007 20:23:49 +0000 (+0100)
Subject: Reduce the number of false "merges" by skipping "branch from" entries in the integrat... 
X-Git-Tag: v1.5.3-rc0~65^2^2~189
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd87020bd3969dbac5ae26c527bcf50fe0ebb845;p=git.git

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.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index d0832e8c3..a45068d36 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -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