Branch: refs/heads/2.062
  Home:   https://github.com/D-Programming-Language/druntime
  Commit: 97a9f09919c651dd104555ad5f5dd959974a567d
      https://github.com/D-Programming-Language/druntime/commit/97a9f09919c651dd104555ad5f5dd959974a567d
  Author: Alex Rønne Petersen <alex@alexrp.com>
  Date:   2013-03-17 (Sun, 17 Mar 2013)

  Changed paths:
    M src/rt/cover.d

  Log Message:
  -----------
  Merge pull request #449 from WalterBright/fixcovercrash

fix random crash with -cov

Any reason this didn't go through a pull request to the 2.062 branch?

On 3/17/13 1:29 PM, GitHub wrote:
>    Branch: refs/heads/2.062
>    Home:   https://github.com/D-Programming-Language/druntime
>    Commit: 97a9f09919c651dd104555ad5f5dd959974a567d
>        https://github.com/D-Programming-Language/druntime/commit/97a9f09919c651dd104555ad5f5dd959974a567d
>    Author: Alex Rønne Petersen <alex@alexrp.com>
>    Date:   2013-03-17 (Sun, 17 Mar 2013)
>
>    Changed paths:
>      M src/rt/cover.d
>
>    Log Message:
>    -----------
>    Merge pull request #449 from WalterBright/fixcovercrash
>
> fix random crash with -cov

_______________________________________________
D-runtime mailing list
D-runtime@puremagic.com
http://lists.puremagic.com/mailman/listinfo/d-runtime

In general I've just been taking care of things that, once merged, need to be reflected in other branches. This particular one is a regression (it isn't in D1), though I haven't bothered to figure out just when it was introduced.

On 3/17/2013 1:50 PM, Brad Roberts wrote:
> Any reason this didn't go through a pull request to the 2.062 branch?
>
> On 3/17/13 1:29 PM, GitHub wrote:
>>    Branch: refs/heads/2.062
>>    Home:   https://github.com/D-Programming-Language/druntime
>>    Commit: 97a9f09919c651dd104555ad5f5dd959974a567d
>> https://github.com/D-Programming-Language/druntime/commit/97a9f09919c651dd104555ad5f5dd959974a567d
>>    Author: Alex Rønne Petersen <alex@alexrp.com>
>>    Date:   2013-03-17 (Sun, 17 Mar 2013)
>>
>>    Changed paths:
>>      M src/rt/cover.d
>>
>>    Log Message:
>>    -----------
>>    Merge pull request #449 from WalterBright/fixcovercrash
>>
>> fix random crash with -cov
>

_______________________________________________
D-runtime mailing list
D-runtime@puremagic.com
http://lists.puremagic.com/mailman/listinfo/d-runtime

Just like any master branch change, checkins to the other branches deserve a sanity check by way of a pull test as well.  That they build and pass tests in the master branch doesn't directly imply success on the other branches.  It just means there's a high likelihood of it.

Additionally, particularly for the past release branches, a pull request is an implicit request to approve a back port of a bug fix.

On 3/17/13 2:10 PM, Walter Bright wrote:
> In general I've just been taking care of things that, once merged, need
> to be reflected in other branches. This particular one is a regression
> (it isn't in D1), though I haven't bothered to figure out just when it
> was introduced.
>
> On 3/17/2013 1:50 PM, Brad Roberts wrote:
>> Any reason this didn't go through a pull request to the 2.062 branch?
>>
>> On 3/17/13 1:29 PM, GitHub wrote:
>>>    Branch: refs/heads/2.062
>>>    Home:   https://github.com/D-Programming-Language/druntime
>>>    Commit: 97a9f09919c651dd104555ad5f5dd959974a567d
>>> https://github.com/D-Programming-Language/druntime/commit/97a9f09919c651dd104555ad5f5dd959974a567d
>>>
>>>    Author: Alex Rønne Petersen <alex@alexrp.com>
>>>    Date:   2013-03-17 (Sun, 17 Mar 2013)
>>>
>>>    Changed paths:
>>>      M src/rt/cover.d
>>>
>>>    Log Message:
>>>    -----------
>>>    Merge pull request #449 from WalterBright/fixcovercrash
>>>
>>> fix random crash with -cov
>>
>
> _______________________________________________
> D-runtime mailing list
> D-runtime@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/d-runtime

_______________________________________________
D-runtime mailing list
D-runtime@puremagic.com
http://lists.puremagic.com/mailman/listinfo/d-runtime

How can something be marked as a pull request for multiple branches?

On 3/17/2013 3:27 PM, Brad Roberts wrote:
> Just like any master branch change, checkins to the other branches deserve a sanity check by way of a pull test as well.  That they build and pass tests in the master branch doesn't directly imply success on the other branches.  It just means there's a high likelihood of it.
>
> Additionally, particularly for the past release branches, a pull request is an implicit request to approve a back port of a bug fix.
>
> On 3/17/13 2:10 PM, Walter Bright wrote:
>> In general I've just been taking care of things that, once merged, need
>> to be reflected in other branches. This particular one is a regression
>> (it isn't in D1), though I haven't bothered to figure out just when it
>> was introduced.
>>
>> On 3/17/2013 1:50 PM, Brad Roberts wrote:
>>> Any reason this didn't go through a pull request to the 2.062 branch?
>>>
>>> On 3/17/13 1:29 PM, GitHub wrote:
>>>>    Branch: refs/heads/2.062
>>>>    Home: https://github.com/D-Programming-Language/druntime
>>>>    Commit: 97a9f09919c651dd104555ad5f5dd959974a567d
>>>> https://github.com/D-Programming-Language/druntime/commit/97a9f09919c651dd104555ad5f5dd959974a567d 
>>>>
>>>>
>>>>    Author: Alex Rønne Petersen <alex@alexrp.com>
>>>>    Date:   2013-03-17 (Sun, 17 Mar 2013)
>>>>
>>>>    Changed paths:
>>>>      M src/rt/cover.d
>>>>
>>>>    Log Message:
>>>>    -----------
>>>>    Merge pull request #449 from WalterBright/fixcovercrash
>>>>
>>>> fix random crash with -cov
>>>
>>
>> _______________________________________________
>> D-runtime mailing list
>> D-runtime@puremagic.com
>> http://lists.puremagic.com/mailman/listinfo/d-runtime
>
> _______________________________________________
> D-runtime mailing list
> D-runtime@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/d-runtime

_______________________________________________
D-runtime mailing list
D-runtime@puremagic.com
http://lists.puremagic.com/mailman/listinfo/d-runtime

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

_______________________________________________
D-runtime mailing list
D-runtime@puremagic.com
http://lists.puremagic.com/mailman/listinfo/d-runtime