[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: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 21 Apr 2009 17:35:09 -0400

> 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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-21 23:36:19 CEST

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