RE: Un-removing a directory

Jan,
 
My working copy is up-to-date. The directory in question is not in the head revision, and so is not in my WC.
 
The problem is that there is no simple way to get it back into the head revision.
 
The only thing that has come close, is to merge the parent directory back to the previous revision. This has
the unfortuate side-effect of merging everything in that directory and all sub directories back to a previous revision,
which is not, in general, what you want when you are trying to un-remove a single directory. You can subsequently
delete everything else in that directory and do an update, but that is not the way I would expect to have to do
this.
 
I can also use svn copy to place the deleted directory in a different location within my source tree, but not back
into the location where it was originally. You can commit the files in the new location and then move them back
to the original location, and commit again.
 
This seems like a bug, since svn is supposed to operate on either directories or files in the same fashion, and
you cleary have to jump through some hoops to get a removed directory back into your tree. Still better than
cvs, though ;-)
 
Dave S.

________________________________

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

        Dave,

        Really you first need to ensure that the working copy is up to date.

        And, of course, in this case you could simply 'svn rm' the directory?

        -- Jan Evert

                -----Original Message-----
                From: Dave Salmon [SMTP:dsalmon@Equilibrium.com]
                Sent: Wednesday, June 02, 2004 3:09 PM
                To: Jan Evert van Grootheest; users@subversion.tigris.org
                Subject: RE: Un-removing a directory

                Jan,
                  
                The directory does not exist in my WC. So, if I use svn merge -rX:X-1 testDir . it simply complains that testDir has no URL.

                But if I supply the URL, I get
                  
                svn: REPORT request failed on '/svn/!svn/vcc/default'
                svn: REPORT of '/svn/!svn/vcc/default': Could not read chunk size: Secure connection truncated (http
                s://myservername)
                  
                The server is accessed via ssl.
                  
                Dave S.

                  _____
                

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

                        Dave,

                        You have more changes in revision X that you don't want to lose?
                        Of course, you could merge only part of the changes.
                        In the directory where the incorrect directory is, try 'svn merge -r X:X-1 incorrectdir .' That should apply only the changes on incorrectdir on . (Perhaps the second dot needs to be incorrectdir as well)

                        -- Jan Evert

                        -----Original Message-----
                        From: Dave Salmon [SMTP:dsalmon@Equilibrium.com]
                        Sent: Wednesday, June 02, 2004 1:38 PM
                        To: users@subversion.tigris.org
                        Subject: RE: Un-removing a directory

                        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.

                                        ================================

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

                ================================

        === 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 15:50:02 2004