AAAAH. That makes perfect sense. Thanks for the quick response.
-----Original Message-----
From: Mark Phippard [mailto:markp@softlanding.com]
Sent: Tuesday, October 11, 2005 3:31 PM
To: users@subclipse.tigris.org
Subject: Re: Subclipse merge- cannot replace from within
"Brian E. Fox" <brianf@reply.infinity.nu> wrote on 10/11/2005 03:22:04
PM:
> Why is it not 25? Also in the TO revision, it changed from head to 25.
> There where no differences between 24 and 25, ever it seems because 24
> isn't on my branch.
With the merge dialog open press F1, then navigate to the help from the
popup.
The revision picker for this dialog operates under the assumption that
you will pick the revision or revision range that you want to merge.
Assuming you want to merge the changes committed in revision N, the
syntax in Subversion for doing so is to specify a from value of N-1 and
a to value of N. So if the changes you want were committed in revision
25, the syntax to merge that revision is a from of 24 and a to of 25.
> When I click dry run or merge, I get the following error:
> merge --dry-run -r24:HEAD
> svn: Cannot replace a directory from within
I would search the Subversion users@ list and also their FAQ. I know
this comes up a lot. I believe it most typically occurs when you
include in your revision the revision when the branch was created. And
the text of your message confirms this. If you created your branch in
revision 25, and committed the fixes in revision 26. Then you only want
to merge the latter.
Mark
________________________________________________________________________
_____
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM
Email Security Management Services powered by MessageLabs.
________________________________________________________________________
_____
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 12 05:58:59 2005