Skip to content

Commit

Permalink
Merge pull request #1083 from solidify/bugfix/do-not-skip-deferred-re…
Browse files Browse the repository at this point in the history
…visions-if-already-in-journal

Do not skip deferred revisions if the revision is already in the journal file
  • Loading branch information
Alexander-Hjelm authored Dec 19, 2024
2 parents c4523c3 + f0712c6 commit e240a6c
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/WorkItemMigrator/WorkItemImport/ImportCommandLine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ private bool ExecuteMigration(CommandOption token, CommandOption url, CommandOpt
plan.TryPop(out executionItem);
}

if (!forceFresh && context.Journal.IsItemMigrated(executionItem.OriginId, executionItem.Revision.Index))
if (
!forceFresh
&& !executionItem.isDeferred
&& context.Journal.IsItemMigrated(executionItem.OriginId, executionItem.Revision.Index)
)
{
continue;
}
Expand Down Expand Up @@ -316,4 +320,4 @@ private static void EndSession(int itemsCount, int revisionCount, Stopwatch sw)
{ "elapsed-time", string.Format("{0:hh\\:mm\\:ss}", sw.Elapsed) } });
}
}
}
}

0 comments on commit e240a6c

Please sign in to comment.