Deletes should be processed after branching or merging which might have referred to the deleted branch

Author: jnm2

src/TfvcMigrator/TopologyAnalyzer.cs

@@ -62,18 +62,6 @@ public IEnumerable<TopologicalOperation> GetTopologicalOperations(IReadOnlyList<
             }
         }
 
-        foreach (var change in changesetChanges)
-        {
-            if (change.ChangeType.HasFlag(VersionControlChangeType.Delete) && currentBranchPaths.Remove(change.Item.Path))
-            {
-                if (change.ChangeType != VersionControlChangeType.Delete)
-                    throw new NotImplementedException("Poorly-understood combination");
-
-                var deletedBranch = branchIdentifier.Delete(changeset, change.Item.Path);
-                yield return new DeleteOperation(changeset, deletedBranch);
-            }
-        }
-
         branchIdentifier.NoFurtherChangesUpTo(changeset - 1);
 
         var (branches, merges) = GetBranchAndMergeOperations(changesetChanges, branchIdentifier);
@@ -89,6 +77,18 @@ public IEnumerable<TopologicalOperation> GetTopologicalOperations(IReadOnlyList<
         {
             yield return operation;
         }
+
+        foreach (var change in changesetChanges)
+        {
+            if (change.ChangeType.HasFlag(VersionControlChangeType.Delete) && currentBranchPaths.Remove(change.Item.Path))
+            {
+                if (change.ChangeType != VersionControlChangeType.Delete)
+                    throw new NotImplementedException("Poorly-understood combination");
+
+                var deletedBranch = branchIdentifier.Delete(changeset, change.Item.Path);
+                yield return new DeleteOperation(changeset, deletedBranch);
+            }
+        }
     }
 
     private static (ImmutableArray<BranchOperation> Branches, ImmutableArray<MergeOperation> Merges)