Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

TortoiseHg with TortoiseSvn Diff

I recently switched over from SVN to Hg. I used to use TortoiseSVN, and now I'm using TortoiseHg. One thing I really miss, though, are the TortoiseSVN style diffs; the Hg ones are just harder to read and understand.

Is there some way to tell TortoiseHg to use the TortoiseSVN diff tool?

like image 803
ashes999 Avatar asked May 18 '11 17:05

ashes999


People also ask

How to compare two files using TortoiseSVN?

Just hold down the Shift key while you right click on the file. Then select TortoiseSVN → Diff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to.

Does TortoiseSVN include subversion?

TortoiseSVN is a really easy to use Revision control / version control / source control software for Windows. It is based on Apache™ Subversion (SVN)®; TortoiseSVN provides a nice and easy user interface for Subversion.


2 Answers

Right Click -> TortoiseHg -> Global Settings -> TortoiseHg -> Visual Diff tool -> Choose TortoiseMerge

like image 78
manojlds Avatar answered Jan 03 '23 02:01

manojlds


No idea why TortoiseHg doesn't come with this built in, because both TortoiseSVN and TortoiseGIT do.

So we have to somehow download TortoiseIDiff.exe from either project, add it to our TortoiseHg folder and add something along those lines into Mercurial.ini, which currently can be found under Windows Explorer's contextual menu (right mouse click) > TortoiseHg > Global Settings > Edit File:

[extdiff]
cmd.tortoisediff = C:\Program Files\TortoiseHg\TortoiseIDiff.exe
opts.tortoisediff = /left:"$parent" /lefttitle:"$plabel1" /right:"$child" /righttitle:"$clabel" /showinfo
like image 44
cregox Avatar answered Jan 03 '23 01:01

cregox