Support changesets deleting branches at the same time as merging them…

… to another branch
Techsola · May 8, 2023 · 675ac4c · 675ac4c
1 parent f1abdf0
commit 675ac4c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/TfvcMigrator/Program.cs b/src/TfvcMigrator/Program.cs
@@ -1,6 +1,7 @@
 using System.CommandLine;
 using System.CommandLine.NamingConventionBinder;
 using System.Globalization;
+using System.Linq;
 using System.Text;
 using LibGit2Sharp;
 using Microsoft.TeamFoundation.SourceControl.WebApi;
@@ -520,7 +521,8 @@ private static void ReportProgress(int changeset, int total, TimedProgress timed
                     keySelector: mappingByBranch => mappingByBranch.Branch,
                     dependenciesSelector: mappingByBranch => additionalParents
                         .Where(b => b.Branch == mappingByBranch.Branch)
-                        .Select(b => b.ParentBranch))
+                        .Select(b => b.ParentBranch)
+                        .Where(branchMappings.ContainsKey)) // If the parent branch is also being deleted in the same commit, it doesn't affect the relative order
                 .ToImmutableArray();
 
             yield return new MappingState(