Skip to content
This repository was archived by the owner on Nov 28, 2019. It is now read-only.

Conversation

@marsu-dev
Copy link

@marsu-dev marsu-dev commented Dec 16, 2018

this PR depend on #10

This PR update liquide 3.14.2 to 3.14.3 based on bitcoin v0.14.3

git commandes:

  • git checkout -b rebase_liquid_3.14.3 rebase_liquid_3.14.2
  • git rebase v0.14.3 --preserve-merge
  • git checkout -b update_bitcoin_v0.14.3 update_bitcoin_v0.14.2
  • git merge --strategy-option theirs --squash rebase_liquid_3.14.3

make check passed

@instagibbs
Copy link
Collaborator

Sorry for not getting back to this, we had been discussing our own strategy to keeping up with Core on future branch versions.

I'm not sure I'm a fan of squashing the commits. It's helpful to me to do diagnostics of what commits are where in the history. Would you consider a non-squashed version?

@marsu-dev
Copy link
Author

Sure,
I have keept the rebased branches locally:

The essential conflict was on configure.ac and src/clientversion.h
I tried to keep the version coherent with the corresponding version from the upstream.

You will found two fixes for unit test

These commit should be a fixup for the corresponding commit, but I keep them apart.

For the locale string I also did two separate commit

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants