Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use two different error messages. #29

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Use two different error messages. #29

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7349227
Use two different error messages.
JohanLarsson Mar 19, 2024
11f7eb4
address feedback in comment
JohanLarsson Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/TfvcMigrator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,16 @@ pat is not null

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("Should not be reachable. Should be a single changeset matching parent branch.");
jnm2 marked this conversation as resolved.
Show resolved Hide resolved
}
}
else
{
Expand Down
Loading