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

Error Resolving Tree Conflict Involving Externals

From: <webpost_at_tigris.org>
Date: Mon, 18 May 2009 05:36:38 -0700 (PDT)

I have a situation where project B contains a folder Z that is an external of folder Z in project A. I merged a revision from project A into project B that contained revisions inside the folder Z (among other things). This results in a tree conflict as expected. However, there is no easy way to get rid of the conflict short of nuking the repository. Marking it as resolved, does nothing, and attempting to revert results in an error.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-18 15:44:01 CEST

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