flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bertrand Delacretaz <bdelacre...@apache.org>
Subject Re: [LAZY] Commit en_AU and en_GB locales to SVN
Date Thu, 23 Feb 2012 14:34:31 GMT
On Thu, Feb 23, 2012 at 12:18 AM, Alex Harui <aharui@adobe.com> wrote:
> ...I think Omar might be right.  We create a single branch (not necessarily on
> the whiteboard), you and others check in their changes there, later we merge
> them in.  Right after the parity release we want cut another release with
> your changes and a few other changes in there so we'll integrate those
> changes from the branch back to trunk....

I agree with that, if the decision is to have the parity release that
matches exactly the code that Adobe donates this is the best way.

That's assuming the code required to cut the parity release comes in
relatively soon, or more precisely that the branch won't contain
thousands of changes until then - if the branch diverges too much from
the trunk, merging might be painful.


View raw message