FW: Tree conflict

[kloer...@ups.com]

Can someone help? This folder is useless as it is. Do I need to uninstall Subversion and then reinstall it?

kloer...@ups.com

-----Original Message-----
From: Loertscher Kim (NSGO737)
Sent: Tuesday, January 21, 2014 4:05 PM
To: us...@tortoisesvn.tigris.org
Subject: RE: Tree conflict

The *exact steps* to get a Tree Conflict. Remember that this folder is messed up on my working copy so I need to get it replaced, but with the same name as before.

I delete my local copy of the Assemblies folder from my working copy . I go to the repo browser and right-click on Assemblies and select Checkout. I go to my woking copy and create a new folder Assemblies. In the Checkout window I change the Checkout directory to point to the new folder I just created. I click on OK. It restores almost all of the files from the repo browser and I get a message Checkout Failed! Tree confilct C:\SVN\net_sysdev\WebSites\Assemblies
Warning!: One or more files are in a conflicted state.
Error: Tree conflict can only be resolved to 'working' or 'mine-conflict' state;
Error: 'C:\SVN\net_sysdev\WebSites\Assemblies' not resolved

I double click on the Tree conflict to open the Edit Tree Conflict window.
The message displayes The last update operation tried to modify the directory 'Assemblies', but the directory was replaced. Conflict Sources. Source Left: ....../Assemblies@12777 Source Right: ...../Assemblies@12782 I click on Mark as Resolved.

I look at the objects restored and notice one object is missing in my working copy. This is an object that I had created and had done SNV add, but had not committed before my working copy was deleted, but another developer had added and committed the same object, so it exists in the repo browser, but will not check out to my working copy. When I manually add the object to my working copy it immediately shows up as SVN add, ready to commit. If I try to Commit the object I get this:
Error: Commit failed (details follow):
Error: 'C:\SVN\net_sysdev\WebSites\Assemblies' is not known to exist in the repository and is not part of the commit, yet its child 'C:\SVN\net_sysdev\WebSites\Assemblies\trunk\Reference\UPSFreight.ServiceModel.dll' is part of the commit.

If I try to do a commit on the Assemblies folder, it shows the Assemblies folder with a status of replaced


kloer...@ups.com


-----Original Message-----
From: Ben Fritz [mailto:fritzo...@gmail.com]
Sent: Tuesday, January 21, 2014 5:58 AM
To: us...@tortoisesvn.tigris.org
Subject: Re: Tree conflict

On Fri, Jan 17, 2014 at 5:07 PM, <kloer...@ups.com> wrote:
> I have a tree conflict on one of the folders in my working copy. All attempts to clear the conflict have failed. I have tried to delete my local copy and then do a checkout from the repo browser, but when it restores the folder and all of its contents, the conflict still remains. How can I get rid of this and start fresh with this folder?
>

A "tree conflict" should only ever happen during a merge.

You are never doing a merge on a fresh checkout.

So what *exact steps* do you follow to get this "tree conflict" in a fresh checkout? What message do you get to tell you that you have a "tree conflict"? What exact menu item are you choosing from your repo browser to do a "checkout"?

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

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

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

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Gavin Lambert]

On 28/01/2014 07:30, Quoth kloer...@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