Bug in merging a replaced file

I recently ran across a bug in trying to merge a replaced file. 'svn
up' returns a 'does not exist in repository' error.

I started from a clean branch, ran 'svn merge -r ${OLD}:${NEW}
${URL}/trunk .', then tried 'svn up'. This is what I got:
  [dmlee@hermes my-branch]$ svn --version
  svn, version 1.2.1 (r15230)
     compiled Jul 13 2005, 05:35:50
  <snip/>
  [dmlee@hermes my-branch]$ svn up
  svn: REPORT request failed on '/svn/production/!svn/vcc/default'
  svn: Working copy path 'file.c' does not exist in repository
  [dmlee@hermes cruiser-xdr-audit-events]$ svn status file.c
  R + file.c

I tried with version 1.2.3 on Windows with similar results. I ran the
example script found at
http://www.nabble.com/Bug-if-merging-a-replaced-file-p911641.html.
>svn --version
  svn, version 1.2.3 (r15833)
     compiled Aug 19 2005, 23:10:39
  <snip/>
>bug.bat
>set location=c:\testsvn
>set url=file:///c:/testsvn/rep
>cd c:\testsvn
>svnadmin create rep
>svn mkdir -m "" file:///c:/testsvn/rep/A/
  Committed revision 1.
>mkdir A
>svn co file:///c:/testsvn/rep/A/ A
  Checked out revision 1.
>echo "XXX" 1>A\test
>svn add A\test
  A A\test
>svn commit -m "" A
  Adding A\test
  Transmitting file data .
  Committed revision 2.
>svn copy -m "" file:///c:/testsvn/rep/A/ file:///c:/testsvn/rep/B/
  Committed revision 3.
>mkdir B
>svn co file:///c:/testsvn/rep/B/ B
  A B\test
  Checked out revision 3.
>svn delete B\test
  D B\test
>echo "XXX" 1>B\test
>svn add B\test
  A B\test
>svn commit -m "" B
  Replacing B\test
  Transmitting file data .
  Committed revision 4.
>svn merge -r 3:4 file:///c:/testsvn/rep/B/ A
  D A\test
  A A\test
>svn update A
  svn: Working copy path 'test' does not exist in repository

Anyone else had similar issues?

dave
<><

CONFIDENTIAL: This email, including its contents and attachments, if any, are confidential. If the reader of this e-mail is not an intended recipient, you have received this e-mail in error and any review, dissemination, distribution or copying is strictly prohibited. If you have received this e-mail in error, please notify the sender immediately by return e-mail at [emailaddress@crossroads.com] and permanently delete the copy you received. Copyright and other intellectual property rights in its contents are the sole property of Crossroads Systems, Inc. Email transmission cannot be guaranteed to be secure or error-free. The sender therefore does not accept liability for any errors or omissions in the contents of the message which arise as a result of email transmission. Although we routinely screen for viruses, addressees should check this email and any attachments for viruses. We make no representation or warranty as to the absence of viruses in this email or any attachments.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 29 23:00:30 2005