Re: merging back branch from trunk

On Thu, 2004-06-24 at 04:58, Aymeric Alibert wrote:
> In our environment, we currently work with a trunk and 2 branches.
> As development in the trunk is getting more stable, we synchronize the
> 2 branches with the latest changes from the trunk. We did that many
> times.
> Now, we want to merge all the changes from branch1 back to the trunk.
>
> Can we do a 'regular' merge between branch1 and the trunk?
> Or do we have to be worried about the 'synchronization merges' we did
> previously and need to exclude them from the merge?

Yes, you need to be worried about repeating the merges. Look at this
part of chapter 4:

http://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.2

When merging the branch back to the trunk, you need to make sure to
exclude revisions that trunk already has. (Hopefully you've been
writing good commit messages in your branch that describe exactly which
revisions have been ported from trunk to branch, as the book describes.)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 24 14:52:48 2004