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

RE: Re: Clean-up problem

From: Andreas Merkle <andreas.merkle_at_newtec.de>
Date: Thu, 7 Apr 2011 06:06:38 -0700 (PDT)

> Am 07.04.2011 14:19, schrieb Andreas Merkle:
>
> [Attribution line fixed once again:]
> > Felix Saphir wrote:
> >>
> >> To avoid confusion, please give us some explicit directory names,
> >> especially in which directory the .svn subdirectory is missing.
> >
> > You can create a example to see the problem:
> >
> > C:\TEMP\TEST
> > | a.txt
> > |
> > |---a
> > | | b.txt
> > | \---.svn
> > \---.svn
> >
> > 1. Create a local repository for this test.
> > 2. Create the directories and files as shown above.
> > 3. Import everything to the repository.
> > 4. Delete the .svn in TEST\a\.svn
> > 5. Now you have my situation.
>
> I know, and I already did to help you with your case. Please tell us in
> which folder the now deleted .svn sub-folder was.

The deleted .svn directory was in c:\temp\test\a\

>
> >> In general you should *not* move folders into or from your working copy
> >> manually. Please restore the previous situation as good as possible.
> >
> > Don't say this to me ... say this to the development tool. ;-)
> >
> > It is not the normal use case, that is right. But this situation can
> > happen all the time and shall be healable with tortoisesvn all the time.
>
> The problem isn't TortoiseSVN, it's the subversion library below. It is
> nevertheless really easy to fix, but not by moving folders around. Now,
> if you told us, from which folder the .svn sub-folder was deleted, this
> would be easy to describe, but now I have to resort to a more
> complicated description:
>
> Did you move the directory the .svn subdirectory was deleted from back
> to it's original place? Good. Now it should display the exclamation icon
> overlay. Rename the obstructed folder, e.g. append '_', so TortoiseSVN
> doesn't recognize it as part of the working copy. The folder with the
> missing .svn subdirectory should now be reported 'missing' in the
> check-for-modifications dialog.
>
> Now you can safely cleanup and update. Updating should recreate the
> 'missing' directory. After that you can copy the .svn-directory to the
> original directory.
>
> A final word of warning: The cleanest way is to checkout a fresh working
> copy and to move everything from your original working copy there.

It works as you described. Thanks!
But ... in my example it is really easy to do it this way. In my real world problem, there are many directories and if I have to do this for every directory ... oh my god.

Do you think there is a chance to get this working somehow with one of the next tortoisesvn without a new subversion library!?

Andreas

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2717655

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-07 15:06:39 CEST

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