Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-03-03 16:50:42 +01:00
Code Issues Packages Projects Releases Activity

less false integrations

Browse Source
This commit is contained in:
Simon Hausmann
2007-03-10 21:23:49 +01:00
parent c78fd1b668
commit 8be48137ae
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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