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

RE: Un-removing a directory

From: Dave Salmon <dsalmon_at_Equilibrium.com>
Date: 2004-06-02 13:38:01 CEST

Ok, using svn merge -r X:X-1 . .
 
will merge the old revision into the current directory. But this merges everything in the current directory back to
the old version. What if I "only" want the deleted directory merged. Not the other files and directories in the current
directory? Then it would seem that I would have to specify the directory as a url (since the directory does not exist
in the WC). And that does not seem to work.
 
Dave S.

________________________________

        From: Dave Salmon [mailto:dsalmon@Equilibrium.com]
        Sent: Wednesday, June 02, 2004 4:27 AM
        To: users@subversion.tigris.org
        Subject: RE: Un-removing a directory
        
        
        Ok,
         
        I got that to work. I misunderstood your dots as ellipses. You can't specify the url, just the current path (as in ". .")
         
        thanks...

________________________________

                From: Dave Salmon [mailto:dsalmon@Equilibrium.com]
                Sent: Wednesday, June 02, 2004 4:25 AM
                To: users@subversion.tigris.org
                Subject: RE: Un-removing a directory
                
                
                I tried what you suggest. It does not appear to work on directories. I get
                 
                svn merge -r HEAD:63 https://myserver/svn/dcsTest/testDir
                 
                svn: REPORT request failed on '/svn/!svn/vcc/default'
                svn: REPORT of '/svn/!svn/vcc/default': Could not read chunk size: Secure connection truncated (https://myserver)
                 
                If I try to merge the individual file as
                 
                
                svn merge -r HEAD:63 https://myserver/svn/dcsTest/testDir/test.txt
                 
                I get:
                 
                svn: PROPFIND request failed on '/svn/!svn/bc/65/dcsTest/testDir/test.txt'
                svn: '/svn/!svn/bc/65/dcsTest/testDir/test.txt' path not found
                 
                However, I can successful update to version 63 and the files come back.
                 
                Dave S.
                 

________________________________

                        From: Jan Evert van Grootheest [mailto:j.grootheest@euronext.nl]
                        Sent: Wednesday, June 02, 2004 2:04 AM
                        To: 'M'; users@subversion.tigris.org
                        Subject: RE: Un-removing a directory
                        
                        

                        M,

                        Just as you undo any other change:
                        suppose you want to undo revision X, try this in a working copy
                        svn merge -r X:X-1 . .

                        -- Jan Evert

                                -----Original Message-----
                                From: M [SMTP:marcus.rohrmoser@gmx.de]
                                Sent: Wednesday, June 02, 2004 11:02 AM
                                To: users@subversion.tigris.org
                                Subject: Re: Un-removing a directory

                                -----BEGIN PGP SIGNED MESSAGE-----
                                Hash: SHA1

                                | I'm new to subversion, and I have removed a directory (and committed the
                                | remove).
                                | Now, I'd like to get it back.

                                Check http://www.contactor.se/~dast/svnusers/archive-2004-04/1365.shtml
                                -----BEGIN PGP SIGNATURE-----
                                Version: GnuPG v1.2.4 (MingW32)
                                Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

                                iD8DBQFAvZeWXjHhiL8/upYRAj4CAJ4jIpE9pey1aoTzPaAmgj6bgppZSQCfT5Sr
                                2JypEyagsE3IDISbxPW/Rr0=
                                =Qx+N
                                -----END PGP SIGNATURE-----

                                ---------------------------------------------------------------------
                                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 Wed Jun 2 13:38:55 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.