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

Merge problem/question

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-10-04 17:02:20 CEST

I am working with a Subclipse user that is getting the "Cannot replace
directory from within" error message when doing a merge of changes created
on a branch back to his trunk. When he runs a similar command using the
command line it works. For example this:

svn merge -r9941:HEAD url://host/svnroot/path /home/username/wc

The user did some experimenting, and if he enters the command line like
this, then it gets the same error as Subclipse

  svn merge url://host/svnroot/path_at_9941 \
     url://host/svnroot/path_at_HEAD /home/username/wc

Based on the arguments we have in our JavaHL merge command, it is likely
that the second command is closer to what we are probably executing.

This is with 1.3 or 1.4.

Now in this user's case, they just informed me that the branch was created
in r9942 which was the original reason I gave for the error message. They
should likely not be including this revision in the merge. Nonetheless,
any arguments I make in this direction are undercut by the fact the
command line when used in the first form above does not seem to have a
problem with this.

Does anyone have a good explanation as to why?

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 4 17:02:40 2006

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