[D-runtime] [D-Programming-Language/druntime] 97a9f0: Merge pull request #449 from WalterBright/fixcover...

Martin Nowak dawg at dawgfoto.de
Mon Mar 18 17:26:37 PDT 2013


On 03/17/2013 11:47 PM, Walter Bright wrote:
> How can something be marked as a pull request for multiple branches? 
I don't think it's possible.
The correct way to do it is to create a pull request for say the 2.062 
branch,
then the 2.062 gets merged into 2.063 which gets merged into master.
At least that's what the wiki suggests 
(http://wiki.dlang.org/Release_Process#Regression_fix).
This doesn't integrate very well with github and the autotester.
The best I can think of is to do the merges through a pull request.

NB:
Merging from master to the version branch would obviously not work.

Cherry-picking from the master branch to the version branch is forbidden 
because
git would no longer know that both commits are the same. This could 
cause conflicts
when merging a version branch into master because it has to fall back to 
an svn-style
3-way merge.

http://wiki.dlang.org/Release_Process#Don.27ts



More information about the D-runtime mailing list