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

Re: FW: Tree conflict

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Tue, 28 Jan 2014 10:55:16 +1300

On 28/01/2014 07:30, Quoth kloertscher_at_ups.com:
> Can someone help? This folder is useless as it is. Do I need to
> uninstall Subversion and then reinstall it?

As was already explained in a reply to the prior post, using Checkout
into the middle of an existing working copy is a very big no-no.

You need to delete (not SVN Delete) any folders in your working copy
that you have done such a sub-checkout on, and then SVN Update at the
root of your working copy to recover the subfolders.

Note that any modifications or unversioned files you have in the
subfolders will be destroyed during this process.

If there are too many such subfolders or you just don't know where they
are, you will need to delete your entire working copy and perform a
fresh checkout at the root.

If you want to try to preserve your changes, you will need to make a
fresh checkout and then manually copy your changes from your old working
copy to the new one before deleting your old working copy.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-27 22:55:54 CET

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

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