Re: merging

On Mon, 2004-08-09 at 17:05, Culley Harrelson wrote:

> The merging example then details merging the branch back into
> the trunk without having pulled the changes from the trunk into the
> branch. Say we have this set of revisions:
>
> 1 - initial creation
> 2 - commit to trunk
> 3 - branch to my-branch
> 4 - commit to trunk
> 5 - commit to trunk
> 6 - commit to my-branch
> 7 - merge 4:5 into my-branch
> 8 - commit to trunk
> 9 - commit to my-branch
>
> How would you then merge the branch back into the trunk?

"Very carefully". :-)

Seriously, this is exactly why we need merge tracking, so that
Subversion will know not to try and 'repeat' the applications of
changesets 4 and 5 into the trunk again.

So in the meantime, you'd have to merge r5:6 from branch to trunk, as
well as r8:9 from branch to trunk.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 10 00:10:07 2004