Target Path not found during svn merge

From: Oliver Wickham <oliver.wickham_at_skinkers.com>
Date: Wed, 3 Sep 2008 15:56:00 +0100

Hi,

I have been tracking the progress of merging in SVN with excitment. When 1.5.0 was released, I downloaded a copy
and tested it with a copy of our existing repository. I found a couple of merge related issues. When I looked at
the svn issue tracker, I found that there was some fixed issues in 1.5.1 that sounded similar to the problem I
was seeing. I retested. Some issues went away, but one remains, and remains in 1.5.2. So...

Our repository is structured as follows:

projects
        ->dairy
               ->trunk
               ->branches
                         ->branch1, etc

For our tests, I copied the trunk into dairy folder as copy1. The operation completed successfully. I then modified
the copy1 tree with additions, deletions and modifications, and committed. Next I changed into the trunk folder and
executed

svn merge http://svn.foo.com/projects/dairy/copy1 .

SVN returns "svn: Target path does not exist". It seems that in the past the trunk folder was renamed, and somehow
the merge is getting confused. It is worth noting that svn:mergeinfo property is empty at this point. I cleared it
out because the python svnmerge upgrade script does not seem to order revisions correctly, so I deleted the contents
of svn:mergeinfo.

Anyway, so I believe there is a problem with the lookup of the history when merging. I executed the operation over
http and captured the conversation with the server with wireshark. See below.

I you need any more information, I would be happy to oblige. P.S. Unfortunately the repository is not public facing.

Regards,

Oliver

----Wireshark---------
OPTIONS /projects/dairy/trunk HTTP/1.1

Host: foo.svn.com

User-Agent: SVN/1.5.2 (r32768) neon/0.28.3

Keep-Alive:

Connection: TE, Keep-Alive

TE: trailers

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

Accept-Encoding: gzip

HTTP/1.1 401 Authorization Required

Date: Wed, 03 Sep 2008 14:22:20 GMT

Server: Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.8g DAV/2 SVN/1.5.2 mod_fastcgi/2.4.6

WWW-Authenticate: Basic realm="Subversion repository"

Content-Length: 401

Keep-Alive: timeout=5, max=100

Connection: Keep-Alive

Content-Type: text/html; charset=iso-8859-1

<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>401 Authorization Required</title>
</head><body>
<h1>Authorization Required</h1>
<p>This server could not verify that you
are authorized to access the document
requested. Either you supplied the wrong
credentials (e.g., bad password), or your
browser doesn't understand how to supply
the credentials required.</p>
</body></html>
OPTIONS /projects/dairy/trunk HTTP/1.1

Host: foo.svn.com

User-Agent: SVN/1.5.2 (r32768) neon/0.28.3

Keep-Alive:

Connection: TE, Keep-Alive

TE: trailers

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

Accept-Encoding: gzip

Authorization: Basic xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==

HTTP/1.1 200 OK

Date: Wed, 03 Sep 2008 14:22:20 GMT

Server: Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.8g DAV/2 SVN/1.5.2 mod_fastcgi/2.4.6

DAV: 1,2

DAV: version-control,checkout,working-resource

DAV: merge,baseline,activity,version-controlled-collection

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

DAV: http://subversion.tigris.org/xmlns/dav/svn/partial-replay

DAV: <http://apache.org/dav/propset/fs/1>

MS-Author-Via: DAV

Allow: OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,LOCK,UNLOCK,CHECKOUT

Content-Length: 0

Keep-Alive: timeout=5, max=99

Connection: Keep-Alive

Content-Type: text/plain

PROPFIND /projects/dairy/trunk HTTP/1.1

Host: foo.svn.com

User-Agent: SVN/1.5.2 (r32768) neon/0.28.3

Connection: TE

TE: trailers

Content-Type: text/xml

Accept-Encoding: gzip

Depth: 0

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

Content-Length: 300

Accept-Encoding: gzip

Authorization: Basic b2xpdmVyd2lja2hhbTpGb29MMmlpMw==

<?xml version="1.0" encoding="utf-8"?><propfind xmlns="DAV:"><prop><version-controlled-configuration xmlns="DAV:"/><resourcetype xmlns="DAV:"/><baseline-relative-path xmlns="http://subversion.tigris.org/xmlns/dav/"/><repository-uuid xmlns="http://subversion.tigris.org/xmlns/dav/"/></prop></propfind>HTTP/1.1 207 Multi-Status

Date: Wed, 03 Sep 2008 14:22:20 GMT

Server: Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.8g DAV/2 SVN/1.5.2 mod_fastcgi/2.4.6

Content-Length: 698

Content-Type: text/xml; charset="utf-8"

<?xml version="1.0" encoding="utf-8"?>
<D:multistatus xmlns:D="DAV:" xmlns:ns1="http://subversion.tigris.org/xmlns/dav/" xmlns:ns0="DAV:">
<D:response xmlns:lp1="DAV:" xmlns:lp3="http://subversion.tigris.org/xmlns/dav/">
<D:href>/projects/dairy/trunk/</D:href>
<D:propstat>
<D:prop>
<lp1:version-controlled-configuration><D:href>/projects/!svn/vcc/default</D:href></lp1:version-controlled-configuration>
<lp1:resourcetype><D:collection/></lp1:resourcetype>
<lp3:baseline-relative-path>dairy/trunk</lp3:baseline-relative-path>
<lp3:repository-uuid>82e2581b-47fa-0310-bd36-f8837200dfe4</lp3:repository-uuid>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
PROPFIND /projects/!svn/vcc/default HTTP/1.1

Host: foo.svn.com

User-Agent: SVN/1.5.2 (r32768) neon/0.28.3

Connection: TE

TE: trailers

Content-Type: text/xml

Accept-Encoding: gzip

Label: 0

Depth: 0

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

Content-Length: 148

Accept-Encoding: gzip

Authorization: Basic b2xpdmVyd2lja2hhbTpGb29MMmlpMw==

<?xml version="1.0" encoding="utf-8"?><propfind xmlns="DAV:"><prop><baseline-collection xmlns="DAV:"/><version-name xmlns="DAV:"/></prop></propfind>HTTP/1.1 207 Multi-Status

Date: Wed, 03 Sep 2008 14:22:20 GMT

Server: Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.8g DAV/2 SVN/1.5.2 mod_fastcgi/2.4.6

Vary: Label

Content-Length: 449

Content-Type: text/xml; charset="utf-8"

<?xml version="1.0" encoding="utf-8"?>
<D:multistatus xmlns:D="DAV:" xmlns:ns0="DAV:">
<D:response xmlns:lp1="DAV:" xmlns:lp3="http://subversion.tigris.org/xmlns/dav/">
<D:href>/projects/!svn/bln/0</D:href>
<D:propstat>
<D:prop>
<lp1:baseline-collection><D:href>/projects/!svn/bc/0/</D:href></lp1:baseline-collection>
<lp1:version-name>0</lp1:version-name>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
REPORT /projects/!svn/bc/0/dairy/trunk HTTP/1.1

Host: foo.svn.com

User-Agent: SVN/1.5.2 (r32768) neon/0.28.3

Connection: TE

TE: trailers

Content-Type: text/xml

Accept-Encoding: gzip

DAV: http://subversion.tigris.org/xmlns/dav/svn/depth

DAV: http://subversion.tigris.org/xmlns/dav/svn/mergeinfo

DAV: http://subversion.tigris.org/xmlns/dav/svn/log-revprops

Content-Length: 130

Accept-Encoding: gzip

Authorization: Basic b2xpdmVyd2lja2hhbTpGb29MMmlpMw==

<S:mergeinfo-report xmlns:S="svn:"><S:revision>0</S:revision><S:inherit>explicit</S:inherit><S:path></S:path></S:mergeinfo-report>HTTP/1.1 404 Not Found

Date: Wed, 03 Sep 2008 14:22:20 GMT

Server: Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.8g DAV/2 SVN/1.5.2 mod_fastcgi/2.4.6

Content-Length: 228

Content-Type: text/html; charset=iso-8859-1

<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>404 Not Found</title>
</head><body>
<h1>Not Found</h1>
<p>The requested URL /projects/!svn/bc/0/dairy/trunk was not found on this server.</p>
</body></html>
Received on 2008-09-03 16:56:30 CEST

This message: [ Message body ]
Next message: etrillaud_at_ntsys.fr: "Re: execute a script before commit"
Previous message: Reedick, Andrew: "RE: Re: working-revision keyword"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]