incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject How to Merge Unstable Branch (was: [POLL] Use Unstable Branch)
Date Wed, 08 Aug 2012 22:50:59 GMT



On 8/8/12 3:19 PM, "Justin Mclean" <justin@classsoftware.com> wrote:

> No one has yet answered this:
> How can you merge from unstable to trunk persons A changes when the unstable
> branch contains persons A, B, C, D, E and F changes and each person may of
> made multiple check ins at different (overlapping) times?
> 
> As far as I'm aware you can't do this via revision numbers. If you think it
> can be done (via revision numbers or some other way) please give me a sample
> sequence of SVN commands that would achieve it.
You specify the revision number in the merge command.  If A did revision 100
and B did 101 etc, you would do (from within your working copy of trunk):
    svn -merge -c 100 unstable-branch-url

> 
> If we do go down the path of having a single unstable branch. What I think is
> likely to happen is that as more and more changes are added to unstable it
> will become harder and harder to merge any persons changes with trunk, this
> will cause delays with releases and waste time with committers having to fight
> with SVN.
Hopefully, the net of changes to unstable eventually end up in trunk so the
two don't get too far out of sync.  Even unstable shouldn't contain really
unstable stuff.  Maybe it should be called "unsure".  I also think this
works in part because there is no serious changes going into trunk that
didn't go into unstable first.  Trunk is generally only changed by merges
(except maybe for version numbers and readme's and stuff unlikely to cause
conflicts).

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message