svn merge - File Not Found (single, binary file)

Hi,

I am trying to merge a single binary file from a branch. Some history:

My repository looked like this:
/vendor
    /hibernate
        /current
            hibernate2.jar
        /2.0.2
            hibernate2.jar
/project/
    /trunk
        /lib
            /deploy
                hibernate.jar

/vendor/hibernate/current/2.0.2/hibernate2.jar was first imported into
current/, then current/ was copied to 2.0.2/, and finally,
/vendor/hibernate/2.0.2/hibernate2.jar was copied to
/project/trunk/lib/deploy/hibernate.jar.

A few days ago, I moved /project/trunk/lib/deploy to
/project/trunk/src/web/WEB-INF/lib.

Today, I imported Hibernate 2.1.1 in /vendor/hibernate/current, and
tagged current/ to 2.1.1/ (as the Subversion book recommends).

Obviously, I wanted some of the new files from 2.1.1 into my project.

I tried merging the changes back to my WC, using the following:

K:\project\src\web\WEB-INF\lib>svn st

K:\project\src\web\WEB-INF\lib>svn merge
https://svn.hopto.org:8193/repos/vendor/hibernate/2.0.2/hibernate2.jar
https://svn.hopto.org:8193/repos/vendor/hibernate/2.1.1/hibernate2.jar
hibernate.jar
svn: Can't remove file 'hibernate.jar.2.tmp': Le fichier spécifié est
introuvable.

K:\project\src\web\WEB-INF\lib>svn st
M hibernate.jar

K:\leadmanagement\src\web\WEB-INF\lib>svn --version
svn, version 0.35.1 (r8050)
   compiled Dec 21 2003, 07:34:35

The SVN error says "File Not Found". I tried many different times, and I
always get the same results. I am on Win2K SP3.

BTW, is the merge command I ran the right one to use ? I think I am
asking "Apply the set of changes that occured between 2.0.2 and 2.1.1
into my local WC, for hibernate.jar". I usually merge files inside the
same branch, so I've never actually had the occasion to use the two
argument form of merge.

Thanks for any tip !

Bye !
François
Developer of Java Gui Builder
http://jgb.sourceforge.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 28 06:33:30 2003