[thg] Visual diff survey

Steve Borho steve at borho.org
Wed Jan 13 19:25:02 CST 2010


On Wed, Jan 13, 2010 at 5:19 PM, Matt Joiner <anacrolix at gmail.com> wrote:
> windows:
>
> [extdiff]
> cmd.tortoisemerge = tortoisemerge
>
> [tortoisehg]
> vdiff = tortoisemerge
>
> [merge-tools]
> #tortoisemerge.priority=-9
> #tortoisemerge.args=/base:$output /mine:$local /theirs:$other
> /merged:$output
> #tortoisemerge.regkey=Software\TortoiseSVN
> #tortoisemerge.gui=True
>
> additionally, tortoisemerge shows an error for diffs against files which
> don't exist, this occurs for files that have just been added, or deleted
> from a repo. if the behaviour under tortoisesvn, that is diffing against an
> empty file in these cases could be emulated, that would be great (can i do
> this with some change to my tortoisemerge args or otherwise above?).

Yes, this is a good point.

The current extdiff code sets the non-existant filename to os.devnull,
which on Linux is '/dev/null' and on Windows is simply 'nul'.  Many
diff tools do not handle 'nul' correctly.

Since the new visual diff code is now giving labels for the files, we
could create an empty file for comparison and give it a label like
"[non-existant]@rev".  That would work for adds and deletes.

--
Steve Borho


More information about the Mercurial mailing list