BUG: resolve left/right key names overlap in merge #665
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
|
Rebased & merged |
|
Thanks! |
There was a problem hiding this comment.
@ogrisel I'm struggling to find a case where exclude_names would be non-empty after this block of code. Any ideas (since you worked on this most recently)? Gonna keep hacking at it a bit here
There was a problem hiding this comment.
I don't think it can, actually. Just going to remove this code as the test suite is pretty exhaustive and never passes non-empty exclude names to the maybe_rename_join method
There was a problem hiding this comment.
Basically I implemented this to make the new test_handle_overlap_arbitrary_key test pass.
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.
Here is an attempt at fully resolving name conflict in merges when
left_onorright_onkeys are passed explicitly.I am not sure my fix is correct but I include a new non-regression test to highlight the issue and the resolution does not introduce any regression findable by running
nosetests.