[master] Move handling of duplicate files#4286
Closed
blueyed wants to merge 1 commit intopytest-dev:masterfrom
Closed
[master] Move handling of duplicate files#4286blueyed wants to merge 1 commit intopytest-dev:masterfrom
blueyed wants to merge 1 commit intopytest-dev:masterfrom
Conversation
blueyed
force-pushed
the
move-duplicates-master
branch
from
627fb4c to
ebf9969
Compare
This was referenced Nov 1, 2018
This removes the hack added in pytest-dev#3802. Adjusts test: - it appears to not have been changed to 7 intentionally. - removes XXX comment, likely not relevant anymore since 6dac774. Backport of e041823 (pytest-dev#4241) from features.
blueyed
force-pushed
the
move-duplicates-master
branch
from
ebf9969 to
af2d195
Compare
Contributor
Author
|
Closing this in favor of #4285 - where the fix from features will go into as well. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Backport of e041823 (#4241)
from features.