Page MenuHomePhabricator
Differential D980

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

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

Details

Reviewers
deadalnix
jasonbcox
matiu
Group Reviewers
Restricted Project
Commits
rSTAGING6bde9a61e0f8: Start a guide regarding how to backport code to Bitcoin-ABC
rABC6bde9a61e0f8: Start a guide regarding how to backport code to Bitcoin-ABC
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
Branch
backporting
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 1663
Build 1663: arc lint + arc unit

Event Timeline

schancel created this revision.Jan 18 2018, 23:16
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 18 2018, 23:16
deadalnix added inline comments.Jan 18 2018, 23:34
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.

jasonbcox added inline comments.Jan 18 2018, 23:35
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.

schancel added inline comments.Jan 19 2018, 02:12
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)

schancel updated this revision to Diff 2586.Jan 19 2018, 02:18

Update based on suggestions from reviewers.

Harbormaster completed remote builds in B1663: Diff 2586.Jan 19 2018, 02:18
jasonbcox accepted this revision as: jasonbcox.Jan 19 2018, 03:50
This revision is now accepted and ready to land.Jan 19 2018, 03:50
jasonbcox accepted this revision.Jan 19 2018, 03:52
matiu added a comment.Jan 19 2018, 04:26

Nice ! Thanks for putting this together.

doc/backporting.md
11

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

13

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

63

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

matiu accepted this revision.Jan 19 2018, 04:29

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

schancel updated this revision to Diff 2596.Jan 19 2018, 23:30

Fix minor nits

Harbormaster completed remote builds in B1666: Diff 2596.Jan 19 2018, 23:30
Closed by commit rABC6bde9a61e0f8: Start a guide regarding how to backport code to Bitcoin-ABC (authored by schancel). · Explain WhyJan 19 2018, 23:30
This revision was automatically updated to reflect the committed changes.
schancel added inline comments.Jan 19 2018, 23:40
doc/backporting.md
63

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.

Revision Contents
Changeset List

PathSize
doc/
85 lines

Diff 2586

View Options

doc/backporting.md

Loading...