[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: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 22 Mar 2010 14:49:53 -0400

> 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?
>
> Thank you for any help you can give me!

I would expect this happens on a binary object. However, I'm not sure why it thinks a .sql file is binary. Do you have some mime type (svn:mime-type) specified as a property of that file which causes svn to think it is binary rather than text?

http://svnbook.red-bean.com/nightly/en/svn.forcvs.binary-and-trans.html

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-22 19:48:50 CET

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