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

Re: Weird merge problem

From: Ron Hunter-Duvar <ron.hunter-duvar_at_oracle.com>
Date: Tue, 21 Apr 2009 15:51:06 -0600

Bob Archer wrote:
>> The last commit to trunk was r1003. The branch was made at r7232
> (based
>> on "svn log --stop-on-copy") and worked on up to r12212 (the current
>> head revision), then frozen. I checked out a clean working copy of
> trunk
>> at r12212. From within the clean trunk working copy I did this
> command:
>> svn merge -r 7232:12212 $REPOS/branch
> Don't you need to specify the branch folder???
> svn merge -r 7232:12212 $REPOS/branch/ThisBranchHere
> Usually you copy into a folder of branch when you do the branch. Don't
> you?
> What if you just try:
> svn merge $REPOS/branch
> if you are using svn 1.5 or newer it should figure out what revision
> range needs to be merged.
> That said... if you just want to move your branch as is to your trunk
> you can delete trunk and copy the branch to trunk.
> BOb
When I said $REPOS/branch that was just short hand for the full url,
svn://<repository>/branches/<name-of-branch>. I know I got that part
right (if I didn't, it would have made a much bigger mess, pulling in a
bunch of old branches).

I was working around the problem by deleting all the *.working and
*.merge-left.r0 files and moving all the *.merge-right.r12212 files to
their base names, and some other clean up (seems merge won't delete
stuff that's in trunk but was deleted from branch). But I think your
delete and copy is a much better solution. I'll do that instead. Thanks.

I'd still like to know what I did wrong though. Or is this how merge is
supposed to work (I hope not)?


Ron Hunter-Duvar
All opinions expressed here are mine, and do not necessarily represent
those of my employer.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-21 23:52:45 CEST

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