[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] Re: Re: "Diff" shows expanded keywords as diffs, but "Create patch" and "svn diff" don't

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-02-07 14:45:03 CET

SteveKing wrote:
>>> Does that setting apply to TMerge as well?
>>
>> Not directly (see my other post):
>> TMerge comes up with temporary Filenames.
>
> Not just TMerge! When keywords should be _not_ expanded, TSVN _must_
> create a temporary file - the original file in the working copy has
> the keywords expanded.

I'm not concerned about temporary filenames, but it does seem that we
have a mixed-up UI here. If the "Don't convert" applies to TMerge as
well, then it should really be in the top level, and not hidden under
"Advanced", which is advertised simply as per-file-extension diff/merge
programs.

The easiest way to fix this is just to update the doc (we don't mention
this option yet), and maybe change the comment next to the Advanced
button.

But it might be cleaner to make the Advanced dialog configure _all_
external support, so the standard edit box for configuring an external
diff/merge program moves to the "External Program" dialog, and the
"Don't convert" option moves back to the main settings dialog. The
Builtin/External radio button pair could be replaced with a "Use
external Diff program" checkbox which can only be checked if the user
has set up an external diff program.

Just an idea ...

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Feb 7 14:47:09 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.