Re: [avr-llvm-devel] release_26 merged back to trunk

[John M. <ato...@gm...>]

On Fri, Nov 27, 2009 at 11:01 AM, Josef Eisl <za...@za...> wrote:

> Hello,
>
> Our branches release_2x are a little bit irritating. Should they be
> in sync with trunk (and fail with release 2.x due to api changes etc.)
> or should it be compilable with release 2.x.
> I believe the second option is the one to choose but than it should not
> be merged back to trunk! So its not a branch but a tag.
>
> I think the branch and tag release_2x should always be compilable with the
same upstream LLVM SVN path.
Merging a release branch into trunk probable won't need to happen again. I
believe this was a special case.


My suggestions are moving release_2x to tags. Changes in tags should be
> also applied on trunk (e.g. feature added, etc).
>
> The method I've used with SVN is that the tags directory is a snapshot of a
specific release and no work is done off of tags.
The branches directory is used to work on specific releases and special
versions. The beginning of the version release phase triggers the creation
of a release branch. In this case it would be when branches/release_X.x is
created upstream. I believe this is, at least similar to, how the upstream
project does it ( tags/release_26 wasn't created till after the final
release ).




--John