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

Re: unable to merge a feature branch back to trunk.

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-12-09 03:03:58 CET

On Dec 8, 2007 5:27 PM, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> What's weird is when I tried to merge the branch back to trunk.

Welcome to the past couple of weeks :)

Essentially:

Turns out it's not as easy as it sounds like. Namely, notice how the
svnbook currently tells you for feature branches to use totally
asymmetric methods to go trunk->branch and branch->trunk?

Namely, trunk->branch is "take a diff -r123:456 on trunk and apply
that to branch", whereas branch->trunk is "take a diff between trunk
and branch and apply that to trunk".

Trying to make the same exact algorithm to go both ways for a feature
branch is not necessarily even correct, let alone easy. If there's
any way for you to try to catch up with the discussions for the past
few weeks and offer input, that would be great! I know it's been
pretty busy...

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 9 03:04:08 2007

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