[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-12-09 03:17:13 CET

On Dec 8, 2007 9:03 PM, David Glasser <glasser@davidglasser.net> wrote:
> 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...

I think Ben's questions were more basic. He was expecting to see the
reflective merge problem and instead he saw ... nothing. Either a new
bug has popped in with the recent changes or he made a mistake
somewhere. Ben are you sure you are in the trunk-wc?

I do not have time to run through everything with current trunk this
evening, but can perhaps on Monday. Ben, if you look at the merge
tracking sample I used:

http://merge-tracking.open.collab.net/servlets/ProjectProcess?documentContainer=c2__Sample%20repository

The last step, r17 is a reflective merge. In the past, whenever I
have run this merge it worked, it just spit out notifications for some
stuff it shouldn't. I think what it was doing was repeating merges
but then was smart enough to see the changes were in place and not
create conflicts. So I would see a notification for an 'A'dd of a
file that already existed, and Modifcations to files that already had
them. When the command finished, svn st and svn diff gave the results
I was expecting ... keeping in mind this is a simple case.

Anyway, I never saw what you are seeing.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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:17:22 2007

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