[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging Branch back to Trunk

From: Ted Stern <dodecatheon_at_gmail.com>
Date: Fri, 06 Feb 2009 16:03:45 -0800

On 06 Feb 2009 15:37:41 -0800, Alexey Kulikov wrote:
>
> Let's say you've got a project in a Subversion repository, and
> you've created a branch of trunk, in branches/newfeature. You've
> been merging changes from trunk to branches/newfeature for awhile,
> but now you're done with that work and you're ready to move all of
> the changes in the branch back to the trunk. What's the best way to
> do this?
>
> You can follow the directions in the Subversion book, but that leads
> to a huge number of conflicts. Is there a cleaner way? If you've
> merged everything from the trunk into the branch, then what you
> really need is to just move the latest stuff in the branch into the
> trunk, without worrying about conflicts at all.

That's not my understanding of how a proper merge works.

The branch should contain all changes related specifically to the
feature. By merging in changes from the trunk, the only differences
in the branch should be those connected with the feature. Those
changes may not be the most recent changes -- they could have occurred
as the first revision after the branch was created.

So you are *not* doing a merge of diffs between the branch root and
the branch head. You are merging the difference between the *trunk
head* and the *branch head*, on the trunk.

There should be no conflicts if you have indeed kept the branch
updated with all trunk updates.

How this works with svn:mergeinfo, I have no idea.

Ted

-- 
 Frango ut patefaciam -- I break so that I may reveal
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1115373
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-07 01:04:37 CET

This is an archived mail posted to the Subversion Users mailing list.