On Wed, Jan 13, 2010 at 5:19 PM, Matt Joiner <[email protected]> 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-exista...@rev". That would work for adds and deletes. -- Steve Borho ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
