Re: [PATCH] TortoiseMerge: report if files are identical and optionally exit

Stefan Küng wrote:
> I'm not sure if that 'feature' is really something useful. I always
> thought it annoying having a dialog box popping up to tell me that the
> files are identical. Even if they are, I still like to sometimes browse
> through the files - that spares me from opening the file(s) again in a
> text editor.

We like the "go away if the files are identical" feature when we're
using TortoiseMerge from within the Visual Studio IDE (with the PushOk
plugin); that's why I added a command line option -- we want this
behavior *only* in that case. Of course we already have the file open
(or just a click away) when we're within the IDE.

As for the box popping up at all, I completely agree that it should be
optional and I'm willing to implement the customary checkbox in the
options dialog. I just didn't do it already because I was in a hurry to
have the core of the patch ready for my boss. ;)

> Also, the dialog box might tell you a lie: if TortoiseMerge is
> configured to ignore whitespaces/lineendings/..., then you won't get
> 'diffs' but the files are still not identical!

That's OK, "logically identical" is close enough for our needs in this
case. Now that I think about it, however, the message should probably
say "the files differ only in whitespace" if that option is enabled;
Windiff does that for example (and it's not optional, d'oh!).

Anyway, I complain loudly when my colleagues commit unnecessary
whitespace changes. :)

> You could simply use the variables which are used to indicate the number
> of added/deleted/conflicted lines in the status bar. If they're not
> zero, there are differences shown.

Uhm, OK. Will look harder at the code.

> I think we either should add (yet) another option for this or at least
> use a dialog which has the "don't show this again" checkbox
> (SHMessageBoxCheck).

Well, if you do that, then you'll need a button to restore hidden
dialogs. I vote for an option.

-- 
Ciao, Flavio
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org