[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: Paul Burba <ptburba_at_gmail.com>
Date: Tue, 6 May 2008 10:00:26 -0400

On Tue, May 6, 2008 at 7:19 AM, 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,

This is almost certainly issue #3067, in particluar
http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5.

Notice that after the first merge
'/trunk/tools/server-side/svn_dav_log_parse.py' has explicit
mergeinfo. When doing the second cherry harvest merge we hit the
situation described at
http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc7.

C:\SVN\dont-wc>svn merge -r0:31039 https://svn.collab.net/repos/svn/trunk
--- Merging r30801 through r31039 into '.':
U Makefile.in
U build.conf
U www\links.html
<snip>
A contrib\server-side\svnstsw\NEWS
A contrib\server-side\svnstsw\README
 G .

C:\SVN\dont-wc>svn pg svn:mergeinfo -R
. - /branches/1.5.x-r30215:30238
/branches/diff-callbacks3:29985-30687
/branches/log-g-performance:30867-30958
/branches/svn-mergeinfo-enhancements:30045-30214
/branches/svnserve-logging:29754-30819
/trunk:30654-31039
tools\server-side\test_svn_server_log_parse.py -
/branches/1.5.x-r30215/tools/server-side/test_svn_dav_log_parse.py:30238
/branches/log-g-performance/tools/server-side/test_svn_server_log_parse.py:30867-30958
/branches/svn-mergeinfo-enhancements/tools/server-side/test_svn_dav_log_parse.py:30045-30214
/branches/svnserve-logging/tools/server-side/test_svn_server_log_parse.py:29754-30819
/trunk/tools/server-side/test_svn_dav_log_parse.py:29754-30530
tools\server-side\svn_server_log_parse.py -
/branches/1.5.x-r30215/tools/server-side/svn_dav_log_parse.py:30238
/branches/log-g-performance/tools/server-side/svn_server_log_parse.py:30867-30958
/branches/svn-mergeinfo-enhancements/tools/server-side/svn_dav_log_parse.py:30045-30214
/branches/svnserve-logging/tools/server-side/svn_server_log_parse.py:29754-30819
/trunk/tools/server-side/svn_dav_log_parse.py:29754-30530

C:\SVN\dont-wc>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

C:\SVN\dont-wc>svn log -q -r1:HEAD
https://svn.collab.net/repos/svn/trunk/tools\server-side\svn_server_log_parse.py
..\..\..\subversion\libsvn_ra_neon\util.c:543: (apr_err=175007)
svn: '/repos/svn/!svn/bc/31042/trunk/tools%5Cserver-side%5Csvn_server_log_parse.py'
path not found

I had posted a patch to issue 3067 and Kamesh had taken it over a week
or so back. I look at his latest patch today...that is unless Kamesh
is actively working on it(?).

Paul

---------------------------------------------------------------------
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 16:00:44 CEST

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