Improve detection of merge parent #1264
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes issue where the wrong parent is selected for a merge if the correct parent consists entirely of files that were modified in earlier changesets in the merge (it was selecting the highest "version FROM" instead of "version TO").
|
I too am having trouble with some merge-sources being incorrectly marked (usually one too low), and pulling in this changeset fixed my issue. Thank you @DotNetSparky, and I'd like to add my vote to get this merged 👍 |
|
Thanks everyone! |
|
Thank-you @Frans-Willem and @pmiossec! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue where the wrong parent is selected for a merge if the
correct parent consists entirely of files that were modified in earlier
changesets in the merge (it was selecting the highest "version FROM"
instead of "version TO").
I believe this could resolve #974 (it did in my specific case).
I'm having a hard time creating a unit test with a faked repository that demonstrates the original problem. If I can do that, I'll include the tests.
Tested against TFS 2017 and 2019.