[dmd-beta] Preparation for 2.65

[Jesse Phillips]

On Sat, Jan 11, 2014 at 4:09 AM, Mike Wey <mike at mikewey.eu> wrote:

> On 01/10/2014 10:36 PM, Brad Roberts wrote:
>
>>      b. pull request for fixes should be made against and merged with
>>> the branch
>>>
>>
>> wrong, fixes should _always_ be made on master first and then back
>> ported to branches that might require them.  Consider the case of a
>> regression that exists in multiple release branches.
>>
>
> Wouldn't the release branch be merged back into master?
>
> --
> Mike Wey
>

This is the way I see it. The easiest way to fix a bug and merge it into
other branches that need it is to fix it on the oldest branch it exists. To
use the latest branch, as Walter mentions, brings in many other changes
which may or may not be relevant to the issue. This can be as simple as
fixing indentation (which wouldn't actually cause compilation error).

When merging from master to an older branch each needed change needs to be
located during the cherry-pick, if you start with the older branch then it
is just merge all commits, and since this is git we can do this any number
of times. Cherry-picking is great, but I think it is stupid to rely on it
as "standard."

-- 
Jesse Phillips
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.puremagic.com/pipermail/dmd-beta/attachments/20140111/45fa2c76/attachment-0001.html>