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

Re: [Subclipse-users] "Cannot replace directory from within"error while merging

From: Jay Sachs <jay.sachs_at_riskmetrics.com>
Date: 2006-10-04 15:51:54 CEST

Some more experimentation. The following command line invocation fails with
the same error:

  svn merge --dry-run
svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/aslack/hashedF
ilters@9941 \
     
svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/aslack/hashedF
ilters@HEAD /Users/jay/rmg/appdev/Core

and this I believe corresponds to the call made by Subclipse to
SVNClientInterface::merge().

Clearly the shortcut command line option

  svn merge -r9941:HEAD
svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/aslack/hashedF
ilters

does something different. So I ran the following Java program:

    public static void main(String[] args) throws Exception { try {
merge1(); } catch (Exception e) { e.printStackTrace(); } try {
merge2(); } catch (Exception e) { e.printStackTrace(); } } private
static void merge1() throws ClientException { SVNClient client = new
SVNClient();
client.merge("svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/
aslack/hashedFilters", Revision.getInstance(9941),
"svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/aslack/hashed
Filters", Revision.HEAD,
"/Users/jay/rmg/appdev/Core", false,
true, false, true); } private
static void merge2() throws ClientException { SVNClient client = new
SVNClient();
client.merge("svn+ssh://svn.rmgapps.com/export/svnroot/appdev/Core/branches/
aslack/hashedFilters", Revision.HEAD,
Revision.getInstance(9941), Revision.HEAD,
"/Users/jay/rmg/appdev/Core", false,
true, false, true); }
The call to merge2(), which uses an alternate parameteriztion of
SVClientInterface::merge(), succeeds. I suspect this is
what the command line is doing. It should be possible to use this form in
Subclipse when the ³From:²
and ³To:² URLs are identical, shouldn¹t it?
Received on Wed Oct 4 15:52:26 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.