[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

bug with repeated merges of deletion

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 6 May 2008 13:19:58 +0200

Hi,

When merging twice in a row from trunk into a working copy of
a branch, and the merge includes a delete, svn errors out
with "Working copy path 'foo' does not exist in repository"
where foo is the file that's been deleted (or moved) on trunk.

This is how I it happened to me first (commands slightly adjusted
to hopefully make the error reproducable independent of future
commits to our repo):

$ svn co -r 31039 https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default dont-wc

$ cd dont-wc

$ svn merge -r0:31039 https://svn.collab.net/repos/svn/trunk
--- Merging r30801 through r31039 into '.':
...

$ svn merge https://svn.collab.net/repos/svn/trunk
subversion/libsvn_ra_neon/util.c:711: (apr_err=160013)
svn: Working copy path 'tools/server-side/svn_dav_log_parse.py' does not exist in repository

Note that Bhuvaneswaran Arumugam pointed out that this bug does
not show when --ignore-ancestry is used during the second merge.

Attached is a simple shell script that triggers the bug for me
with most recent 1.5.x.

Stefan

-- 
.sig free!

  • application/pgp-signature attachment: stored
Received on 2008-05-06 13:19:05 CEST

This is an archived mail posted to the Subversion Dev mailing list.