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

RE: Help Recovering Directory

From: Jan Evert van Grootheest <j.grootheest_at_euronext.nl>
Date: 2004-09-20 14:20:53 CEST

Andrew,

the 'normal' thing is not to use copy, but merge.
If the offending revision is X, then this should help you (assuming a
working copy without manual changes):

1. svn up
2. svn merge -r X:(X-1) . .
3. svn ci

Note the two dots with a space in-between in step two.
The above simply merges the change of revision X backwards.

I don't know about the svn cleanup things you mention. As far as I know, it
is recursive.

-- Jan Evert

> -----Original Message-----
> From: Andrew n marshall [SMTP:amarshal@ISI.EDU]
> Sent: Monday, September 20, 2004 2:13 PM
> To: users@subversion.tigris.org
> Subject: Help Recovering Directory
>
>
> A user accidentally deleted and committed a project src directory. I
> pointed him to the chapter 4.3 on resurrecting deleted items. For some
> reason he couldn't get it working, and before I knew what happened, the
> other users had exported and re-added another copy of the project.
>
> I've since been trying ot fix the mess. I've cleared old tranactions
> (which I think were the problem with the first resurrection), but now
> everytime I
> svn copy -r 930 svn://.../src .
> I get:
> svn: Working copy '.' locked
> svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
> details)
> leaving just src drectory and no contents. Looking at svnadmin lstxns,
> I see nothing. If I call cleanup and repeat on the next directory down,
> the same thing happens, apparently forcing me to manually recurse. And
> of course URLs don't take wildcards, so this repeats per file as well.
>
> I assume this is not what is supposed to happen. What might be the
> problem and how can I fix it?
>
>
>
> Secondly, what are the side effects of not connecting histories of the
> old src to the exported/re-added copy? Is there a way for me to easily
> append each revision of this new pseudo-branch to the original change
> history of src (once I fix it)?
>
>
> Anm
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
 

 === 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.

 ================================
Received on Mon Sep 20 14:21:39 2004

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