Merging Branch to Trunk

Hi,

I’ve yet to see a clear explanation for this so bear with me as it’s
obviously a hot topic.

Paraphrasing the subversion manaual section "Merging a Whole Branch to
Another", the process of merging changes from branch to trunk is by way of:

$ cd <trunk wc>
$ svn update
$ svn merge <revision range> <branch-url>

Fair enough.

First question: Does this still work if during branch development, certain
changes (but not all) were ported to branch from trunk ?

OK I'll continue. Let's say I finish development and want to port my branch
back to the trunk. Tha manual says to first port all latest changes from
trunk to branch and then:

$ cd <trunk wc>
$ svn update
$ svn merge <trunk url@HEAD> <branch url@HEAD>

Second question: Would this not produce the same result as the top example ?
And if not why not ?

Thanks in advance.

No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.5.484 / Virus Database: 269.12.4/969 - Release Date: 23-Aug-2007
16:04
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 24 15:55:09 2007