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

RE: Unversioned files in working copies

From: Jan Evert van Grootheest <j.grootheest_at_euronext.nl>
Date: 2004-04-13 09:23:24 CEST

Ben, others,

I've seen this before. However, I'm not sure the error messages were the
same. It's been some time ago.

The scenario, more or less, is this: there are at least two working copies
involved here...
WC1 and 2 are both up to date at some revision X.
WC1 removes (or moves, which is a cp + rm!) a subdirectory and commits it.
WC2 has changes in that removed directory. Now if WC2 tries to update you
are in trouble. It can't (or won't) delete it, because there are changes in
it. It can't update it, because it doesn't exist. It can't commit, because
its gone.

-- Jan Evert

> -----Original Message-----
> From: Ben Collins-Sussman [SMTP:sussman@collab.net]
> Sent: Friday, April 09, 2004 6:04 PM
> To: Markus Wolff
> Cc: subversion-user
> Subject: Re: Unversioned files in working copies
> On Fri, 2004-04-09 at 10:43, Markus Wolff wrote:
> > It's not the point that I want it to overwrite unversioned files, it
> > just shouldn't complain when there are unversioned files in the same
> > directory as the working copy. The files wouldn't be overwritten by
> > any file under version control because they don't exist in the
> repository.
> 'svn up' doesn't care when your working copy has unversioned files. It
> only cares when an unversioned file is obstructing the update (i.e. in
> the way of versioned things it's trying to add or change.)
> Which means there is something deeply messed up about your working
> copy. I'm trying to figure out what you did...
> > Okay, here's a transcript, using the commandline this time:
> >
> > [mwolff@BigBlueThingy lastresort]$ svn update module
> > svn: Working copy 'module/crm/schnelleintrag' not locked
> >
> > The directory "schnelleintrag", in this case, has been in the main
> > repository before, but has then been deleted from there and moven out
> > to a spezialized repository, so it's now regarded unversioned by
> > Subversion when appearing in this working copy.
> Are you *sure* about this? What does "deleted and moved out" mean? Did
> you just use Unix 'rm' to delete the thing, rather than actually 'svn
> rm' the directory and commit?
> Because to me, it looks like the directory "schnelleintrag" is still in
> the repository, and therefore 'svn up' is trying to re-add it. And an
> unversioned directory by the same name is sitting in the way.
> Run 'svn ls' on the parent directory's URL (whatever the URL to
> module/crm is). Do you see "schnelleintrag" in the repository still?
> What does 'svn status' say about the module/crm/ directory?
> ---------------------------------------------------------------------
> 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.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 13 09:24:36 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.