Re: bug with repeated merges of deletion

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:src-path>https://svn.collab.net/repos/svn/trunk</S:src-path>
<S:target-revision>28817</S:target-revision>
<S:dst-path>https://svn.collab.net/repos/svn/trunk</S:dst-path>
<S:depth>infinity</S:depth>
<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"
>subversion/mod_dav_svn/static/Makefile.in</S:entry>
<S:entry rev="28817" depth="infinity"
>subversion/mod_dav_svn/static/README</S:entry>
<S:entry rev="28817" depth="infinity"
>subversion/mod_dav_svn/static/config.m4</S:entry>
<S:entry rev="1" depth="infinity"
>tools/server-side/svn_dav_log_parse.py</S:entry>
<S:entry rev="1" depth="infinity"
>tools/server-side/test_svn_dav_log_parse.py</S:entry>
</S:update-report>

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