[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    =?UTF-8?B?W0lzc3VlIDE2NzNdIE5ldyAtIHN2biBtZXJnZSByZXBvcnRzIEZpbA==?=
From:       fbos () tigris ! org
Date:       2003-12-29 1:03:13
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=1673
                  Issue #:|1673
                  Summary:|svn merge reports File Not Found (single, unmodified,
                          |binary file)
                Component:|subversion
                  Version:|current
                 Platform:|All
                      URL:|http://subversion.tigris.org/servlets/ReadMsg?list=us
                          |ers&msgNo=4224
               OS/Version:|All
                   Status:|NEW
        Status whiteboard:|
                 Keywords:|
               Resolution:|
               Issue type:|DEFECT
                 Priority:|P3
             Subcomponent:|unknown
              Assigned to:|issues@subversion
              Reported by:|fbos






------- Additional comments from fbos@tigris.org Sun Dec 28 17:03:13 -0800 2003 -------
See thread for exact details.

The following recipe reproduces the problem:
rd /s/q wc repos
@echo on
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

Running the recipe on my Win2K SP3, SVN 0.35.1 results in the following:

K:\>svn --version
svn, version 0.35.1 (r8050)
   compiled Dec 21 2003, 07:34:35
[snip]

K:\>svnadmin create repos

K:\>svn co file:///repos wc
Checked out revision 0.

K:\>cd wc

K:\wc>svn mkdir vendor vendor/current
A         vendor
A         vendor\current

K:\wc>echo aaa  1>vendor\current\file.zip

K:\wc>svn add vendor\current\file.zip
A         vendor\current\file.zip

K:\wc>svn propset svn:mime-type application/octet-stream vendor\current\file.zip

property 'svn:mime-type' set on 'vendor\current\file.zip'

K:\wc>svn commit -m "Initial version of vendor library"
Adding         vendor
Adding         vendor\current
Adding  (bin)  vendor\current\file.zip
Transmitting file data .
Committed revision 1.

K:\wc>svn copy vendor\current vendor\1.0
A         vendor\1.0

K:\wc>svn commit -m "Tagging release 1.0 of vendor library"
Adding         vendor\1.0

Committed revision 2.

K:\wc>svn mkdir trunk
A         trunk

K:\wc>svn copy vendor\1.0\file.zip trunk\file.zip
A         trunk\file.zip

K:\wc>svn commit -m "Imported release 1.0 of library into project"
Adding         trunk
Adding  (bin)  trunk\file.zip

Committed revision 3.

K:\wc>echo bbb  1>vendor\current\file.zip

K:\wc>svn commit -m "Updated current to release 2.0"
Sending        vendor\current\file.zip
Transmitting file data .
Committed revision 4.

K:\wc>svn copy vendor\current vendor\2.0
A         vendor\2.0

K:\wc>svn commit -m "Tagging release 2.0 of vendor library"
Adding         vendor\2.0
Adding  (bin)  vendor\2.0\file.zip

Committed revision 5.

K:\wc>cd trunk

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
For additional commands, e-mail: issues-help@subversion.tigris.org

[prev in list] [next in list] [prev in thread] [next in thread]