On Sun, 28 Dec 2003 18:15:58 -0600, "Ben Collins-Sussman"
<sussman@collab.net> said:
> 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
Nope, it was not modified. I thought I had mentionned it. Anyway, this
does not look like issue #1319:
http://subversion.tigris.org/issues/show_bug.cgi?id=1319
> non-text svn:mime-type property attached to it?
K:\leadmanagement>svn pl -v src\web\WEB-INF\lib\hibernate.jar
Properties on 'src\web\WEB-INF\lib\hibernate.jar':
description : Hibernate Object/Relational Mapping Framework
svn:mime-type : application/java-archive
>
> 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.
>
>
True, I have Symantec's Norton AntiVirus running...
Here's the repro recipe I created, and it does consistently result in the
same error message:
rd /s/q wc repos
cls
svn --version
svnadmin create repos
svn co file:///repos wc
cd wc
svn mkdir vendor vendor/current
echo aaa >vendor\current\file.zip
svn add vendor\current\file.zip
svn propset svn:mime-type application/octet-stream
vendor\current\file.zip
svn commit -m "Initial version of vendor library"
svn copy vendor\current vendor\1.0
svn commit -m "Tagging release 1.0 of vendor library"
svn mkdir trunk
svn copy vendor\1.0\file.zip trunk\file.zip
svn commit -m "Imported release 1.0 of library into project"
echo bbb >vendor\current\file.zip
svn commit -m "Updated current to release 2.0"
svn copy vendor\current vendor\2.0
svn commit -m "Tagging release 2.0 of vendor library"
cd trunk
svn merge file:///repos/vendor/1.0/file.zip
file:///repos/vendor/2.0/file.zip file.zip
The merge command results in the following:
K:\wc\trunk>svn merge file:///repos/vendor/1.0/file.zip
file:///repos/vendor/2.0
/file.zip file.zip
svn: Can't remove file 'file.zip.2.tmp': Le fichier spécifié est
introuvable.
Same error message !
Let me try without my virus scanner if it changes anything......
Sorry... Doesn't seem to be related. And if it had, I wonder why I got
the same error consistently, using two different reproduction recipes.
Anyway, I'll go file a bug with this repro recipe.
Thanks for the confirmation of my command !
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 Mon Dec 29 01:59:45 2003