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

Re: bug with repeated merges of deletion

From: David Glasser <glasser_at_davidglasser.net>
Date: Tue, 6 May 2008 12:25:22 +0100

It's a server-side error.

Here's the update-report that gets sent, for me:

<S:update-report send-all="false" xmlns:S="svn:">
<S:entry rev="28817" depth="infinity" ></S:entry>
<S:entry rev="28817" depth="infinity" >subversion/mod_dav_svn/static</S:entry>
<S:entry rev="28817" depth="infinity"
<S:entry rev="28817" depth="infinity"
<S:entry rev="28817" depth="infinity"
<S:entry rev="1" depth="infinity"
<S:entry rev="1" depth="infinity"

On Tue, May 6, 2008 at 12:19 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> 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!

David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-06 13:25:36 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.