Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Using mercurial and beyond compare 3(bc3) as the diff tool?

in windows I am able to use winmerge as the external diff tool for hg using mercurial.ini,etc.
Using some options switch that you can find in web(I think it's a japanese website) Anyway, here for example:

hg winmerge -r1 -r2

will list file(s) change(s) between rev1 and rev2 in winmerge. I can just click which file to diff

but for bc3:

hg bcomp -r1 -r2

will make bc3 open a dialog which stated that a temp dir can't be found.

The most I can do using bc3 and hg is

 hg bcomp -r1 -r2 myfile.cpp 

which will open diff between rev1 and rev2 of myfile.cpp

So,it seems that hg+bc3 can't successfully acknowledge of all files change between revision. Only able to diff 1 file at a time.
Anyone can use bc3 + hg better ?

edit: Problem Solved !

Got the solution from http://www.scootersoftware.com/support.php?zz=kb_vcs.php>scooter support page. I have to use bcompare instead of bcomp Here's a snippet of my mercurial.ini

 [extensions] hgext.win32text =  ;mhd adds hgext.extdiff =   ;mhd adds for bc [extdiff] cmd.bc3 = bcompare opts.bc3 = /ro  ;mhd adds for winmerge ;[extdiff] ;cmd.winmerge = WinMergeU ;opts.winmerge = /r /e /x /ub 
like image 994
mhd Avatar asked Nov 27 '08 11:11

mhd


People also ask

How do I compare three files in Beyond Compare?

If the main file and the other files are all located in the same folder, load the folder in the Folder Compare. Then select the main file and one of the other files. Right click and select Open to launch the two files in the Text Compare. Repeat for each file that must be compared to main.

How do I use Beyond Compare as Git Difftool?

Tower (Git)Launch Beyond Compare, go to the Beyond Compare menu and run Install Command Line Tools. Open Tower's preferences dialog on the Git Config Tab. Set the Diff Tool drop-down to Beyond Compare. Set the Merge tool drop-down to Beyond Compare.

How do I add Beyond Compare to perforce?

In Beyond Compare Pro, open Tools | Source Control Integration. Click the Browse button and select the working folder for your Perforce workspace. Click Add and fill in your Perforce connection information.


1 Answers

Beyond-Compare-3 is an amazing tool. I recommend a few tweaks to the setup:

[extensions] extdiff =  [extdiff] cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe opts.bcomp = /leftreadonly  [merge-tools] bcomp.executable = C:\Program Files\Beyond Compare 3\BComp bcomp.args = /leftreadonly /centerreadonly $local $other $base $output bcomp.priority = 1  [ui] merge = bcomp  [tortoisehg] authorcolor = True vdiff = bcomp 
like image 167
2 revs, 2 users 92% Avatar answered Nov 09 '22 18:11

2 revs, 2 users 92%