Skip to content

Commit f158b87

Browse files
committed
Fix problem when picking up erroneous integration from previous revision
1 parent e0f7afc commit f158b87

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

P4Transfer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ def getChange(self, changeNum):
12761276
continue
12771277
processedRevs[chRev.depotFile] = 1
12781278
revision = flog.revisions[0]
1279-
if len(revision.integrations) > 0:
1279+
if len(revision.integrations) > 0 and str(revision.change) == change['change']:
12801280
if not self.options.historical_start_change or revision.change >= self.options.historical_start_change:
12811281
for integ in revision.integrations:
12821282
if 'from' in integ.how or integ.how == "ignored":

0 commit comments

Comments
 (0)