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

Re: Error Resolving Tree Conflict Involving Externals

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 18 May 2009 17:38:00 +0200

webpost_at_tigris.org wrote:
> 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.

Are project A and project B inside the same repository?

If you show the Check-for-modifications dialog, you should be able to
right-click on those conflicts and mark them as resolved.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2300965
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-18 17:38:38 CEST

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