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

Re: Edit Conflict greyed-out

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 22 Mar 2010 19:39:37 +0100

On 22.03.2010 19:34, Lori Howland wrote:
> New to Tortoise, but have logged exp w/src control.
>
> The Merge Conflict CallbackDialog
> shows the Edit Conflict option
> greyed-out.
>
> Tortoise guru at my company says he's never seen this before.
>
> I know TortoiseMerge is installed, b/c it launches from "Show Differences"
>
> Is there a simple explanation for why I cannot edit a conflict?

This happens when Subversion treats the file as binary, not text.
In that case, editing the conflict during the merge is not possible
since the svn library won't allow it.

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=2463342
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-22 19:39:37 CET

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