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.

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

Equality test #2240

Merged
merged 3 commits into from Jul 26, 2016
Merged

Equality test #2240

merged 3 commits into from Jul 26, 2016

Conversation

skurfer
Copy link
Member

@skurfer skurfer commented Jul 26, 2016

This gets it passing. It’s more like real-world usage now too, so that’s good.

@skurfer
Copy link
Member Author

@skurfer skurfer commented Jul 26, 2016

OK, now that’s not my fault. I’m using tabs and all I did was change a comment, anyway.

Having said that, I tried combining this with the dupes branch and it fails there, so I need to look some more.

skurfer added 2 commits Jul 26, 2016
Otherwise, objectByMergingObjects will toss one out, returning only the remaining one, and the combined objects will show as equal.
This can be repeated when we drop support for 10.10

This reverts commit 94836d7.
@pjrobertson pjrobertson merged commit b7f6af8 into master Jul 26, 2016
2 checks passed
@pjrobertson pjrobertson deleted the equality branch Jul 26, 2016
skurfer added a commit that referenced this issue Jul 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants