RE: Merge One Direction or Both?

On 7 Nov 2005 Gavin Lambert wrote:

> Quoth trlists@clayst.com <mailto:trlists@clayst.com>:
> > (1) Merge changes from live into dev first so that dev picks
> > up the bugfixes. Then merge from dev back to live to update the
> > trunk with the new features. Will this work? How would I choose
> > which revisions to merge for the second merge?
>
> This is the typical approach, AFAIK. The process is explained in the
> SVN book, but AFAIK you basically just need to remember which revision
> was HEAD in 'live' when you branched (or last merged from it). Then you
> can merge in any changes made since then. Typically you do this by
> noting it in the comments for the branch.

Thanks for the response.

That part I've done before. It's a bit confusing because the book
mentions "stop on copy" but that methhod doesn't work if you are
continuously maintaining two branches and resynchronizing them from
time to time. There is no copy in that scenario except the original
one. But I do have the comments when I merged that show what revisions
were merged.

However ... imagine this scenario:

        At r27 the two branches are synchronized (last merge)
        'Live' branch has some changes committed in r28 - r30
        'Dev' branch has also been updated (WC only)
        Merge live changes from r28:30 to dev -- this gets bug fixes
                into the dev branch -- and resolve any conflicts
        Commit dev as r31

Here I think it's simple -- if dev has not been committed since r27 I
can just merge dev changes from r27:31 back to live. Right?

But what about this:

        At r27 the two branches are synchronized (last merge)
        'Live' branch has some changes committed in r28 and r30
        'Dev' branch has some changes committed in r29 and r31
        'Dev' branch has also been updated (WC only)
        Merge live changes from r28:30 to dev, should work as above
        Commit dev as r32

Now, how do I get the dev changes back into the live branch? What
revisions do I merge? The interlacing makes it very confusing.

--
Tom
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org