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

Updating Hashdiff Gem #229

Merged
merged 1 commit into from
Jul 23, 2020
Merged

Conversation

jonmchan
Copy link

@jonmchan jonmchan commented Jul 11, 2020

I was tired of seeing rspec error:

The HashDiff constant used by this gem conflicts with another gem of a similar name.  As of version 1.0 the HashDiff constant will be completely removed and replaced by Hashdiff.  For more information see https://github.com/liufengyun/hashdiff/issues/45.

This PR updates the hashdiff library to the 1.x version and changes the reference to the new Hashdiff as opposed to the old HashDiff constant.

Addresses liufengyun/hashdiff#45.

@dpzaba
Copy link
Member

dpzaba commented Jul 16, 2020

Hi @jonmchan ! could you add your change in history.md (inside a ## Changed section)? after the merge I could generate a new version/tag

@jonmchan
Copy link
Author

@dpzaba what should I make this - 2.2.0.beta4?

@dpzaba
Copy link
Member

dpzaba commented Jul 17, 2020

@dpzaba what should I make this - 2.2.0.beta4?

Sorry but I think I did not explain properly, I was asking to add the changes in a Changed section that currently does not exist, not to set a version.

To avoid more confusions and to speed up the merge could you just leave the changes to lib/couchrest/model/dirty.rb and couchrest_model.gemspec files?. I will add the change to history.md.

You can use the rest of the changes for a new PR.

@jonmchan
Copy link
Author

@dpzaba ping

@dpzaba
Copy link
Member

dpzaba commented Jul 23, 2020

@dpzaba ping

it seems I can not merge it, I already ping @samlown

@samlown
Copy link
Member

samlown commented Jul 23, 2020

Sorry about that! You should be good to go now @dpzaba! Thanks!

@dpzaba dpzaba merged commit 0b08da1 into couchrest:master Jul 23, 2020
@dpzaba
Copy link
Member

dpzaba commented Jul 23, 2020

Thanks!

@jonmchan jonmchan deleted the update-hashdiff branch July 23, 2020 16:41
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.

3 participants