Merge pull request #1113 from solidify/bugfix/VS402624-error-handling

VS402624 error handling

Author: Alexander-Hjelm

src/WorkItemMigrator/WorkItemImport/WitClient/WitClientWrapper.cs

@@ -121,7 +121,7 @@ public WorkItem UpdateWorkItem(JsonPatchDocument patchDocument, int workItemId,
                 }
                 catch (AggregateException ex)
                 {
-                    bool datesMustIncreaseError = false;
+                    bool errorHandled = false;
                     foreach (Exception ex2 in ex.InnerExceptions)
                     {
                         // Handle 'VS402625' error responses, the supplied ChangedDate was older than the latest revision already in ADO.
@@ -139,10 +139,18 @@ public WorkItem UpdateWorkItem(JsonPatchDocument patchDocument, int workItemId,
                                     break;
                                 }
                             }
-                            datesMustIncreaseError = true;
+                            errorHandled = true;
+                        }
+                        // Handle 'VS402624' error responses, the supplied ChangedDate was in the future.
+                        // We must wait a while and try again.
+                        else if (ex2.Message.Contains("VS402624"))
+                        {
+                            Logger.Log(LogLevel.Warning, $"Received response while updating Work Item: {ex2.Message}." +
+                                $" Waiting and trying again...");
+                           errorHandled = true;
                         }
                     }
-                    if (!datesMustIncreaseError)
+                    if (!errorHandled)
                     {
                         throw;
                     }