Hello,
I've just merged (using 1.0) a branch (made with 0.35) back into trunk. And
now I can't do svn st -u on the working copy:
[issysd25@a05008 components]$ svn st -u
svn: REPORT request failed on '/svn/MAL2/!svn/vcc/default'
svn: The REPORT request returned invalid XML in the response: XML parse
error at line 1: no element found (/svn/MAL2/!svn/vcc/default)
An update reports the same error.
The merge was created like this:
svn merge -r 2357:HEAD
http://a05009:65030/svn/MAL2/products/branch/issysd25/mcStyleSheets/componen
ts .
After that there were some conflicts to resolve and I did all the tests and
compiles and such to ensure that the merge was correct and complete.
A run of svn st -u with neon-debug=130 is below.
What's going on here?
I'm going to attempt to commit now, since colleagues need this new stuff.
But I guess it'll fail.
One more thing I should comment, I guess, is that the working copy where
this is merged has a parent that has this project as an external. But that
shouldn't have any influence, if I understand correctly.
Any comments and suggestions welcome.
Jan Evert
PS: I do not have direct access to the web so if someone asks me to file a
bug report, I'll have to report that I could do that, but I can't (as least)
attach this neon dump.
[issysd25@a05008 components]$ svn st -uv
Creating request...
Running request create hooks.
Request created.
Doing DNS lookup on a05009.aex.nl...
Running pre_send hooks
Sending request headers:
PROPFIND /svn/MAL2/products/trunk/components HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Keep-Alive:
Connection: TE, Keep-Alive
TE: trailers
Content-Length: 300
Content-Type: text/xml
Depth: 0
Sending request-line and headers:
Connecting to 10.200.2.18
Sending request body...
Body block (300 bytes):
[<?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>]
Request body sent: okay.
Request sent; retry is 0.
[status-line] < HTTP/1.1 207 Multi-Status
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Keep-Alive: timeout=15, max=100
Header Name: [keep-alive], Value: [timeout=15, max=100]
[hdr] Connection: Keep-Alive
Header Name: [connection], Value: [Keep-Alive]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 2d6
Got chunk size: 726
Reading 726 bytes of response body.
Got 726 bytes.
Read block (726 bytes):
[<?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>/svn/MAL2/products/trunk/components/</D:href>
<D:propstat>
<D:prop>
<lp1:version-controlled-configuration><D:href>/svn/MAL2/!svn/vcc/default</D:
href></lp1:version-controlled-configuration>
<lp1:resourcetype><D:collection/></lp1:resourcetype>
<lp3:baseline-relative-path>products/trunk/components</lp3:baseline-relative
-path>
<lp3:repository-uuid>82a454ad-22c7-0310-971f-8b8a5316e2dd</lp3:repository-uu
id>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
]
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 207 class 2xx, error line:
207 Multi-Status
Running destroy hooks.
Request ends.
Creating request...
Running request create hooks.
Request created.
Running pre_send hooks
Sending request headers:
PROPFIND /svn/MAL2/!svn/vcc/default HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Connection: TE
TE: trailers
Content-Length: 111
Content-Type: text/xml
Depth: 0
Sending request-line and headers:
Sending request body...
Body block (111 bytes):
[<?xml version="1.0" encoding="utf-8"?><propfind
xmlns="DAV:"><prop><checked-in xmlns="DAV:"/></prop></propfind>]
Request body sent: okay.
Request sent; retry is 1.
[status-line] < HTTP/1.1 207 Multi-Status
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 191
Got chunk size: 401
Reading 401 bytes of response body.
Got 401 bytes.
Read block (401 bytes):
[<?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>/svn/MAL2/!svn/vcc/default</D:href>
<D:propstat>
<D:prop>
<lp1:checked-in><D:href>/svn/MAL2/!svn/bln/2582</D:href></lp1:checked-in>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
]
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 207 class 2xx, error line:
207 Multi-Status
Running destroy hooks.
Request ends.
Creating request...
Running request create hooks.
Request created.
Running pre_send hooks
Sending request headers:
PROPFIND /svn/MAL2/!svn/bln/2582 HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Connection: TE
TE: trailers
Content-Length: 148
Content-Type: text/xml
Depth: 0
Sending request-line and headers:
Sending request body...
Body block (148 bytes):
[<?xml version="1.0" encoding="utf-8"?><propfind
xmlns="DAV:"><prop><baseline-collection xmlns="DAV:"/><version-name
xmlns="DAV:"/></prop></propfind>]
Request body sent: okay.
Request sent; retry is 1.
[status-line] < HTTP/1.1 207 Multi-Status
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 1ca
Got chunk size: 458
Reading 458 bytes of response body.
Got 458 bytes.
Read block (458 bytes):
[<?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>/svn/MAL2/!svn/bln/2582</D:href>
<D:propstat>
<D:prop>
<lp1:baseline-collection><D:href>/svn/MAL2/!svn/bc/2582/</D:href></lp1:basel
ine-collection>
<lp1:version-name>2582</lp1:version-name>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
]
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 207 class 2xx, error line:
207 Multi-Status
Running destroy hooks.
Request ends.
Creating request...
Running request create hooks.
Request created.
Running pre_send hooks
Sending request headers:
PROPFIND /svn/MAL2/!svn/bc/2582/products/trunk/components HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Connection: TE
TE: trailers
Content-Length: 300
Content-Type: text/xml
Depth: 0
Sending request-line and headers:
Sending request body...
Body block (300 bytes):
[<?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>]
Request body sent: okay.
Request sent; retry is 1.
[status-line] < HTTP/1.1 207 Multi-Status
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 2e3
Got chunk size: 739
Reading 739 bytes of response body.
Got 739 bytes.
Read block (739 bytes):
[<?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>/svn/MAL2/!svn/bc/2582/products/trunk/components/</D:href>
<D:propstat>
<D:prop>
<lp1:version-controlled-configuration><D:href>/svn/MAL2/!svn/vcc/default</D:
href></lp1:version-controlled-configuration>
<lp1:resourcetype><D:collection/></lp1:resourcetype>
<lp3:baseline-relative-path>products/trunk/components</lp3:baseline-relative
-path>
<lp3:repository-uuid>82a454ad-22c7-0310-971f-8b8a5316e2dd</lp3:repository-uu
id>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
]
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 207 class 2xx, error line:
207 Multi-Status
Running destroy hooks.
Request ends.
Creating request...
Running request create hooks.
Request created.
Running pre_send hooks
Sending request headers:
PROPFIND /svn/MAL2/products/trunk/components HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Connection: TE
TE: trailers
Content-Length: 300
Content-Type: text/xml
Depth: 0
Sending request-line and headers:
Sending request body...
Body block (300 bytes):
[<?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>]
Request body sent: okay.
Request sent; retry is 1.
[status-line] < HTTP/1.1 207 Multi-Status
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 2d6
Got chunk size: 726
Reading 726 bytes of response body.
Got 726 bytes.
Read block (726 bytes):
[<?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>/svn/MAL2/products/trunk/components/</D:href>
<D:propstat>
<D:prop>
<lp1:version-controlled-configuration><D:href>/svn/MAL2/!svn/vcc/default</D:
href></lp1:version-controlled-configuration>
<lp1:resourcetype><D:collection/></lp1:resourcetype>
<lp3:baseline-relative-path>products/trunk/components</lp3:baseline-relative
-path>
<lp3:repository-uuid>82a454ad-22c7-0310-971f-8b8a5316e2dd</lp3:repository-uu
id>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
</D:multistatus>
]
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 207 class 2xx, error line:
207 Multi-Status
Running destroy hooks.
Request ends.
Creating request...
Running request create hooks.
Request created.
Running pre_send hooks
Sending request headers:
REPORT /svn/MAL2/!svn/vcc/default HTTP/1.1
Host: a05009.aex.nl:65030
User-Agent: SVN/1.0.0 neon/0.24.4
Connection: TE
TE: trailers
Content-Length: 246
Content-Type: text/xml
Sending request-line and headers:
Sending request body...
Body block (246 bytes):
[<S:update-report send-all="true"
xmlns:S="svn:"><S:src-path>http://a05009.aex.nl:65030/svn/MAL2/products/trun
k/components</S:src-path><S:entry rev="2581"></S:entry><S:entry
rev="0">framework/mc/ui/static/xsl/status.xsl</S:entry></S:update-report>]
Request body sent: okay.
Request sent; retry is 1.
[status-line] < HTTP/1.1 200 OK
[hdr] Date: Fri, 12 Mar 2004 11:10:14 GMT
Header Name: [date], Value: [Fri, 12 Mar 2004 11:10:14 GMT]
[hdr] Server: Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0
Header Name: [server], Value: [Apache/2.0.48 (Unix) DAV/2 SVN/1.0.0]
[hdr] Transfer-Encoding: chunked
Header Name: [transfer-encoding], Value: [chunked]
[hdr] Content-Type: text/xml; charset="utf-8"
Header Name: [content-type], Value: [text/xml; charset="utf-8"]
[hdr]
End of headers.
New chunk.
[Chunk Size] < 0
Got chunk size: 0
Zero-size chunk.
[hdr]
End of headers.
Running post_send hooks
Request ends, status 200 class 2xx, error line:
200 OK
Running destroy hooks.
Request ends.
svn: REPORT request failed on '/svn/MAL2/!svn/vcc/default'
svn: The REPORT request returned invalid XML in the response: XML parse
error at line 1: no element found (/svn/MAL2/!svn/vcc/default)
ne_session_destroy called.
ne_session_destroy called.
[issysd25@a05008 components]$
--- --- --- --- --- --- ---
--- --- --- ---
Jan Evert van Grootheest | God's voice thunders in
marvelous
Sw dev: C, C++ and java | ways; he does great things
AtosEuronext Ordina | beyond our understanding.
+31-20-7137000 +31-416-651525 | -- Job 37:5
=== E U R O N E X T - D I S C L A I M E R =============================
This e-mail and its attachments are only intended for the individual(s) or
entity(entities) named above to whom they are addressed and may contain
personal and/or confidential information. Please notify us immediately if
you are not the intended recipient. Any dissemination, duplication,
publication to third parties or other use of the contents of this e-mail or
its attachments is forbidden. Although this information has been compiled
with great care, neither Euronext N.V. nor its subsidiaries shall accept any
responsibility for any errors, omissions or other inaccuracies in this
information or for the consequences thereof, nor shall it be bound in any
way by the contents of this e-mail or its attachments. In the event of
incomplete or incorrect transmission please return the e-mail to the sender.
Cet e-mail et ses annexes sont uniquement destinés à la (aux) personne(s),
ou à l' (aux) entité(s) à laquelle (auxquelle(s)) il est adressé, visée (s)
en tête du présent message. Il peut contenir des informations personnelles
ou confidentielles. Merci de nous notifier immédiatement si cet e-mail vous
a été adressé par erreur. Toute diffusion, copie, publication à des tiers ou
toute autre utilisation de son contenu est interdite. Bien que cette
information ait été rassemblée avec une grande attention, ni Euronext N.V.
ni aucune de ses filiales, ne peut être tenue responsable des erreurs,
omissions ou inexactitudes contenues dans cette information, ni ne peut être
liée d'aucune manière par le contenu de cet e-mail ou ses annexes. En cas de
transmission incorrecte ou incomplète, nous vous prions de retourner cet
e-mail à son émetteur.
Deze e-mail en zijn bijlagen zijn uitsluitend bestemd voor de
geadresseerde(n) als op dit e-mailblad vermeld. Het is mogelijk dat deze
e-mail persoonlijke en/of vertrouwelijke informatie bevat. Wanneer u niet de
geadresseerde bent, verzoeken wij u dringend ons daarvan te berichten. Elke
verspreiding, vermenigvuldiging, gebruik of openbaarmaking aan derden van de
inhoud van deze e-mail en zijn bijlagen, is verboden. Hoewel deze informatie
met de meeste zorg is samengesteld is Euronext N.V., en de tot Euronext N.V.
behorende werkmaatschappijen, op geen enkele wijze aansprakelijk voor
eventuele fouten, omissies of andere onjuistheden in deze informatie of de
gevolgen daarvan noch op enigerlei wijze gebonden aan de inhoud van de
e-mail of zijn bijlagen. Gelieve, in geval van onjuiste of onvolledige
ontvangst, deze e-mail terug te sturen naar de afzender.
================================
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 12 12:22:10 2004