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

On Sat, 2003-12-27 at 23:32, Francois Beausoleil wrote:

> 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

Two questions: was 'hibernate.jar' locally modified before you ran the
merge command? And second, does 'hibernate.jar' have some sort of
non-text svn:mime-type property attached to it?

Your command should work just fine, it looks correct. It should do one
of two things:
  
  1. if the local copy of hibernate.jar has no local mods, and is
identical to the left side of the merge, then it will simply change into
the right side of the merge.

  2. if the local copy is modified, or not identical to the left side
of the merge, you should get a normal "conflict", the same as what you
get when 'svn update' tries to patch a binary file. You get three
fulltexts, a "C" state, and you have to resolve the conflict by hand.

Can you write a short reproduction recipe?

Also, I wonder if this is another one of those win32 rename bugs, due to
a virus scanner or something.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 29 01:16:38 2003