search

decred / copay

A multisignature Decred wallet.
MIT License
5 stars 18 forks source link

Upstream sync #55

Closed peterzen closed 7 years ago

peterzen commented 7 years ago

Decred changes rebased/ported to upstream master branch. Consists of small atomic commits which would help regular/frequent upstream syncing against the upstream release.

I added a Decred app variant that facilititates maintaining the UI/creative aspects of the fork without divergence. For now I added creative assets as a placeholder, this is WIP status for now and needs polishing. To start the build first run the below script to initialize the variant (this will also run npm install)

npm run apply:decred

npm start

NB The changeset doesn't include the i18n directory – to merge the message strings it would be more straightforward/sustainable to use Crowdin

alexlyp commented 7 years ago

Ok so in lieu of trying to merge this with our upstream branch, I've decided to make a new master-sync branch that is PR. After brief testing this method of applying changes on top of the existing copay stack is the way to go. We can now start to test and submit PRs to the new master-sync branch. Closing this PR.

alexlyp commented 7 years ago

upstream will remain a marker as to our current position with the bitpay/copay repo

peterzen commented 7 years ago

I think it would be useful to also add tags to the upstream branch whenever it is pulled from bitpay/master; so that in the next sync cycle a new PR can be made against the top of upstream but the previous commit height is still recorded (in case of any merging issues etc).

I'd suggest 2 tags actually: let's say sync_20170503 and a sync_latest <- this would be moved to the top at each pull.

Does that make sense?