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

RE: after merge, svn st -u fails with XML error

From: Jan Evert van Grootheest <j.grootheest_at_euronext.nl>
Date: 2004-03-12 12:27:32 CET

Hmm, much to my surprise the commit succeeded!

I have a question on the reported log, also. When I look at the log of the
commit with the merge, there appear to be two types of lines:
A /products/trunk/components/framework/mc/ui/static/xsl/envlist.xsl (from
/products/branch/issysd25/mcStyleSheets/components/framework/mc/ui/static/xs
l/envlist.xsl:2581)
M /products/trunk/components/framework/mc/ui/static/xsl/error.xsl

All lines with 'A' are like the first one and apparently know that they came
from the branch.
All lines with 'M' do not have such a comment.
Is this normal or is it because of the fact that the branch was created
using 0.35?

And no, there were no other changes besides the merge.

Thanks,
Jan Evert

> -----Original Message-----
> From: Jan Evert van Grootheest
> Sent: Friday, March 12, 2004 12:21 PM
> To: 'users@subversion.tigris.org'
> Subject: after merge, svn st -u fails with XML error
>
> 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/compo
> nents> .
> 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.
>
        [ ... ]
 

 === 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:28:52 2004

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