On 06/02/12 00:35, Luiz Carlos da Costa Junior wrote:
> Here is the output of  'hg debugconfig' command:
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:12:
> merge-tools.beyondcompare3.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:22:
> merge-tools.beyondcompare2.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:45:
> merge-tools.araxis.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:69:
> merge-tools.kdiff3.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:80:
> merge-tools.diffmerge.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:91:
> merge-tools.diffmerge3.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:102:
> merge-tools.p4merge.dirdiff=False
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:120:
> merge-tools.ecmerge.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:133:
> merge-tools.winmergeu.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:152:
> merge-tools.rekisa.dirdiff=False
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:161:
> merge-tools.bcompare.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:168:
> merge-tools.meld.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:175:
> merge-tools.diffuse.dirdiff=False
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:182:
> merge-tools.xxdiff.dirdiff=True
> C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:189:
> merge-tools.tkdiff.dirdiff=False

Hmm, I cannot see any problem...
Could you attach the whole output of 'hg debugconfig --debug', preferably
executed from "Output Log" widget of TortoiseHg?
(mask private settings like password if any)

> On 1 June 2012 12:22, Yuya Nishihara<[email protected]>  wrote:
>> On 06/01/12 05:43, Luiz Carlos Costa Junior wrote:
>>> Every time I update TortoiseHg and use it for the first time, it loads
>> the
>>> kdiff tool perfectly when I double-click a changed file in the panel that
>>> shows the working directory.
>>>
>>> However, if I close and reopen TortoiseHg and double-click a changed file
>>> again it shows a different screen with:
>>> Title: "Visual Diffs: working changes filtered"
>>> Message: "Temporary files are removed when this dialog is closed."

Is there any difference on how to start TortoiseHg?

Regards,

>>> Is it supposed to be like this or is it a bug?
>>> How can I get kdiff as in the first time always?
>>
>> Perhaps, somehow it loads wrong mergetools setting.
>> Could you provide the output of 'hg debugconfig' command?
>>
>> example:
>> % hg debugconfig --debug | grep dirdiff
>> /etc/mercurial/hgrc.d/thg-mergetools.rc:11:
>> merge-tools.beyondcompare3.dirdiff=True
>> /etc/mercurial/hgrc.d/thg-mergetools.rc:20:
>> merge-tools.beyondcompare2.dirdiff=True
>> ...
>> (dirdiff=True denotes the capability of directory diff)

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to