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

Re: Resolving Tree Conflicts.

From: Alexandre Guillemé <alexandreguilleme_at_gmail.com>
Date: Wed, 17 May 2017 14:25:22 +0200

It happens to me when I've added a new directory D on branch A (all is
commited), compiled my project, which generate unversionned files in this
directory D. Then I Switch to branch B, which is not already merged with
branch A (and so has no directory D). Tortoise (or svn?) fails to remove
that directory while switching, and mark the versionned elements (on A) as
To solve it, I just right-click on this folder > undo add > check all

2017-05-17 12:46 GMT+02:00 Rowan Sylvester-Bradley <

> I have the current situation:
> If I do "check for modifications" on my working copy, I see my list of
> source files and directories, with two directories marked "added(+), tree
> conflict".
> If I right click on one of these and select Edit Conflicts, I see a dialog
> box:
> The last operation tried to delete/move/rename the directory 'include',
> but the directory was already edited. Conflict sources:
> Source Left: https://svn.riouxsvn.com/ticklist/public_html/swchoir/
> include_at_10
> Source Right: https://svn.riouxsvn.com/ticklist/public_html/swchoir/
> include_at_16
> Accept current working copy state (mark as resolved).
> First question: which is Left and which is Right? These terms seem
> meaningless in this situation.
> This seems to suggest that I have (or may have) three different versions,
> rev 10, rev 16 and my working copy. Which of these will be accepted if I
> click the Accept button? How do I check what the difference is between
> these three versions, before deciding what to do (which is presumably
> irreversible)?
> I hope someone can help me get this mess sorted out!
> Thanks - Rowan
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=
> 4061&dsMessageId=3237278
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@
> tortoisesvn.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-05-17 14:25:38 CEST

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.