Page MenuHomePhabricator

Start a guide regarding how to backport code to Bitcoin-ABC
ClosedPublic

Authored by schancel on Jan 18 2018, 23:16.

Details

Summary

So that we don't end up with a variety of different styles of backporting,
this is an attempt at a rough guide for backporting.

Test Plan

Read the document

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

doc/backporting.md
30 ↗(On Diff #2579)

I usually try to figure out if there are bugfix PR comming after int he file that the change touch, so I can backport them as well.

37 ↗(On Diff #2579)

git status helps.

doc/backporting.md
14 ↗(On Diff #2579)

Do you have any tips for identifying which changes are worth backporting? I have the most trouble identifying which are valuable/worth it.

21 ↗(On Diff #2579)

Not all users have SSH keys setup with github. It may be worth using https://github.com/bitcoin/bitcoin.git instead.

doc/backporting.md
14 ↗(On Diff #2579)

Well, depends on the subject. Like I was looking at changes specifically to the test framework. That allows other backports of main-code changes to go in easily. (because they usually change a few lines in the test framework too)

Update based on suggestions from reviewers.

This revision is now accepted and ready to land.Jan 19 2018, 03:50

Nice ! Thanks for putting this together.

doc/backporting.md
11 ↗(On Diff #2586)

This guide should apply to any Bitcoin fork (BU/Xt, etc).

13 ↗(On Diff #2586)

Add the tagging command? git tag -a fork-commit 964a185 -m 'Where the fun started'?

63 ↗(On Diff #2586)

Is there any convension for branch name? Like backport/pr1235?

Added some minor comments. Great work.... thanks, this will help a lot.

This revision was automatically updated to reflect the committed changes.
doc/backporting.md
63 ↗(On Diff #2586)

You can do whatever you'd like for your own convenience. It doesn't affect anything in phabricator. It's probably a wise idea to name them in numerical order -- I get out of whack otherwise.