Mercurial: extdiff takes an unnecessary snapshot of the working directory?

Question

Here is what I have in my Mercurial.ini ...

[extdiff]
cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe
opts.bcomp = /leftreadonly 

So, the extdiff extension works fine except that even if one side of the comparison is my working folder, as in the case when I give only one revision argument, for example. hg bcomp -r 25to get the difference between rev25 and the working directory, it forces my diff tool in this case BC3 to open a folder comparison session comparing the rev25 snapshot with the working directory snapshot , for example ...

left:  C:\Windows\Temp\extdiff.v20d13s\MyCode\ 
right: C:\Windows\Temp\extdiff.q78g269\MyCode\ 

Is there a way so that I can say that it is different from the actual working working directory on the right side, so I can edit from inside the diff tool? This seems to work just fine thanks to the external differences functionality of SVN. I understand that he will display many orphans on the right - I will be happy to suffer from the need to filter them out.

Answer 1

I never found a way to prevent extdiffthe modified files from being copied to the temp version, but if you change them in Beyond Compare, it will copy them back to the working directory when you exit Besides the comparison.

FWIW, this is the corresponding snippet from mine Mercurial.ini:

[extdiff]
cmd.bcomp = C:\Program Files\Beyond Compare 3\BCompare.exe
opts.bcomp =/expandall /solo /lro

Answer 2

Mercurial, extdiff, , . , .; -)

, , extdiff , ( BOTH DIFF, ).

, extdiff, , - ( , ?).

, . , !

Answer 3

extdiff temp dir, diff . , , , diff .

, hg bcomp <file1> -r<rev>, , diff.

@Niall C answer , temp, diff , bcomp, , temp dir , extdiff, diff dir .