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
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
What if you just try:
svn merge $REPOS/branch
if you are using svn 1.5 or newer it should figure out what revision
That said... if you just want to move your branch as is to your trunk
BOb
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.