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

RE: Fwd: svn1.5 seems to fail simple merge-tracking scenario

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 20 Feb 2009 15:54:40 -0500

> > Back on branch1
> > $ svn merge --record-only -r100 ^/trunk
> > $ svn ci -m "Mark r100 as merged"
> >
> > $ svn ci -m "More work on branch"
> > $ svn merge ^/trunk
> > $ svn ci -m "Catch back up with trunk"
> >
> > Back on trunk
> >
> > $ svn merge --reintegrate ^/branch1
> > $ svn ci -m "Commit all work from branch1"
> > Committed revision 200
> >
> > Lather. rinse. repeat.

What is this doing? You are telling the branch that everything in r100
on trunk has already been merged into trunk? Because if you try to merge
into branch from trunk it will try to bring in changes committed in r100
on trunk which was really the commit of your --reintegrate merge?

This is about as obvious as... well, it's NOT obvious.

Why then does the manual say to delete the branch after integration?

Is there anything in the works to no require the manual mergeinfo to be
created? I see why this is problematic because it would require the
merge to create mergeinfo in two working copies on in trunk and one on
the branch?

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200471

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 21:55:35 CET

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