Re: Merging Branches

On Fri, Sep 03, 2004 at 03:11:05PM +0100, Russ Brown wrote:
> The way I see it, there are two possible ways in which this should work:
>
> 1. Merge the revisions between the revisions that were merged from trunk
> to branch, so I've have to do a sequence of merges to get it to work. For
> example, if I merged trunk to branch at revisions 10, 15 and 20 (with the
> branch created at 5), I'd have to merge something like 6:9, 11:14, 16:19,
> 21:HEAD
> 2. Merge all revisions of the branch from the time the branch was created
> (or the last time it was merged to trunk if that is the case) right
> through to head. (i.e. 6:HEAD).
>
> 1. seems like a lot of work to me, and 2 'feels' like it will break. So is
> there another method I'm missing or is one of these the Right Way?

I'm no expert but it seems like your suggestion number 1 is "The Right
Way"(tm). I assume you've read the books chapter on merging?

<http://svnbook.red-bean.com/svnbook/ch04s03.html>

Your number 2 might work if you haven't changed the lines containing
your trunk to branch merges:

        When patching a file, Subversion typically notices if the file
        already has the change, and does nothing.

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