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

Re: Tree conflict

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Tue, 21 Jan 2014 23:28:12 +0000

On 21 January 2014 23:04, <kloertscher_at_ups.com> wrote:
> 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.

OK stop there. That's the mistake. You cannot make a checkout into the
middle of an existing checkout. What you need to do after deleting the
bad folder is to update the parent folder which should fill in the
missing folder. Alternatively you can 'revert' the parent folder and
select only the missing folder (to avoid reverting any other stuff
within the parent directory.

> 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_at_12777 Source Right: ...../Assemblies_at_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
>
>
> kloertscher_at_ups.com

Simon

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-22 00:28:22 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.