Hi, it would be useful if once a branch is released and tagged, it gets merged to master. This way, when generating a version using git describe, git can figure out which is the latest stable tag. This also makes very clear that there are no bugfixes applied to a stable branch that doesn't get ported back to master.

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
Decile que ponga "rails generate tp_prof_fiuba" en la consola y en una
semana se recibe.
	-- Mazzi, filósofo estilista
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Oh, sorry for the wrong subject, I wrote it at a time where I though the tags were completely missing instead of just being diverged from master.

Leandro Lucarella, el 12 de March a las 20:33 me escribiste:
> Hi, it would be useful if once a branch is released and tagged, it gets merged to master. This way, when generating a version using git describe, git can figure out which is the latest stable tag. This also makes very clear that there are no bugfixes applied to a stable branch that doesn't get ported back to master.

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Hi Leandro,

see the last couple of messages in the "2.065 Final Release Prep" thread on dmd-beta.

I would have assumed that Andrew would be in the position to easily perform an after-release merge without much effort, given that he is curating the release branch in the first place. But quite obviously that is not the case.

Best,
David



On 12 Mar 2014, at 21:10, Leandro Lucarella wrote:

> Oh, sorry for the wrong subject, I wrote it at a time where I though the
> tags were completely missing instead of just being diverged from master.
>
> Leandro Lucarella, el 12 de March a las 20:33 me escribiste:
>> Hi, it would be useful if once a branch is released and tagged, it gets
>> merged to master. This way, when generating a version using git
>> describe, git can figure out which is the latest stable tag. This also
>> makes very clear that there are no bugfixes applied to a stable branch
>> that doesn't get ported back to master.
>
> --
> Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

David Nadlinger, el 13 de March a las 00:03 me escribiste:
> Hi Leandro,
> 
> see the last couple of messages in the "2.065 Final Release Prep" thread on dmd-beta.
> 
> I would have assumed that Andrew would be in the position to easily perform an after-release merge without much effort, given that he is curating the release branch in the first place. But quite obviously that is not the case.

Oh, I see, so the problem is merge conflicts, right? If we want to do a "symbolic" merge we can use the "ours" merge strategy (-s ours):

  ours
    This resolves any number of heads, but the resulting tree of the
    merge is always that of the current branch head, effectively
    ignoring all changes from all other branches. It is meant to be used
    to supersede old development history of side branches. Note that
    this is different from the -Xours option to the recursive merge
    strategy.

It won't make sure all the fixes in the release branch are in master but it will generate a merge commit with the right parents.

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
Can you stand up?
I do believe it's working, good.
That'll keep you going through the show
Come on it's time to go.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals