Merge pull request #29 from JohanLarsson/main

Use two different error messages.
Techsola · Mar 20, 2024 · 94a227e · 94a227e
2 parents 359ac31 + 11f7eb4
commit 94a227e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/TfvcMigrator/Program.cs b/src/TfvcMigrator/Program.cs
@@ -253,14 +253,20 @@ private static RootPathChange ParseRootPathChange(string token)
 
                     foreach (var (_, parentChangeset, parentBranch) in mappingState.AdditionalParents.Where(t => t.Branch == branch))
                     {
-                        if (commitsByChangeset.TryGetValue(parentChangeset, out var createdChangesets)
-                            && createdChangesets.SingleOrDefault(c => c.Branch == parentBranch).Commit is { } commit)
+                        if (commitsByChangeset.TryGetValue(parentChangeset, out var createdChangesets))
                         {
-                            parents.Add(commit);
+                            if (createdChangesets.SingleOrDefault(c => c.Branch == parentBranch).Commit is { } commit)
+                            {
+                                parents.Add(commit);
+                            }
+                            else
+                            {
+                                throw new InvalidOperationException($"None of the commits created for the parent changeset {parentChangeset} has the expected branch {parentBranch}.");
+                            }
                         }
                         else
                         {
-                            throw new InvalidOperationException("Should not be reachable. Earlier code should have sorted topologically or failed.");
+                            throw new InvalidOperationException($"A commit should have been created for the parent changeset {parentChangeset} before reaching this point.");
                         }
                     }