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

Merge problem with workaround

From: Paul Glezen <pglezen_at_us.ibm.com>
Date: 2005-06-24 00:25:11 CEST

I'm having trouble performing a merge with symptoms similar to issue 303.
My set up is

Subclipse: 0.9.31
Subversion: 1.2.0 (r14790)
Eclipse: 3.0.2
Access URL: file
SVN Intf: javahl

I set up a simple repository with a few files and a branch, b1, in addition
to the trunk. It looks like this for a file called Main.java.

             10--11--12 <-- b1 branch
----6--7--9------------14 <-- trunk

I switch to the trunk in my workspace. From the src folder, I select Team
-> Merge. I browse to the src folder of the b1 branch and click "Show Log"
button in the "From" section and select "10". But a "9" appears in the
Revision field instead. This doesn't seem so bad. I leave it like that
and choose HEAD in the "To" section. But upon clicking the "Merge" button
this gives me an error and fails. The Console output and stack trace are
included below for reference.

=============== Begin Work Arounds ==========================
Two work-around methods worked for me.

1. Use command line interface

Since this merge works fine from the svn command line using either of these

    svn merge -r 9:HEAD
    svn merge -r 10:HEAD

I went to Windows -> Preferences -> SVN and selected "SVN command line
(beta)". I no longer received the error message and the merge worked.

2. Use a revision number that's actually on the branch

On the SVN plugin's merge panel's history browse, selecting "10" resulted
in "9" appearing in the "From" revision field. I manually changed it to a
10. Then the merge works fine in either javahl or command-line mode.

================ End Work Arounds ============================

It seems to me that having the revision field populate a "9" when I choose
revision "10" is a bug. But I'm still new to Subversion (not to mention
Subclipse) and so I'm not sure if this is by design.

================= Start SVN Conole ========================
merge -r9:HEAD file:///c:/working/svnrepo/echo/branches/b1/src/main/java
    Invalid filesystem path syntax
svn: Cannot replace a directory from within
================= End SVN Console =========================

A window pops up with the following stack trace:

================= Start Stack Trace =====================
org.tigris.subversion.javahl.ClientException: Invalid filesystem path
svn: Cannot replace a directory from within

org.tigris.subversion.javahl.ClientException: Invalid filesystem path
svn: Cannot replace a directory from within

================== End Stack Trace =========================

Paul Glezen
Consulting IT Specialist
IBM Software Services for WebSphere
818 539 3321
Received on Fri Jun 24 08:25:11 2005

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.