[TSVN] Re: Re: Merge dialog, second attempt

SteveKing wrote:
> With all the talk about the (N-1) revision numbers I think most of you
> forgot that Subversion allows not only revision _numbers_ but also
> revision _dates_! And the same rule applies to the dates.
> So _if_ we're going to do something about the (N-1), we also have to
> do the same with the dates entered (or, for that matter, if someone
> enters COMMITTED as the revision).
>
> Now I'm sitting back and watch you guys find a solution for that... ;)

Ignore what I said before. I am now siding with those who want to keep
the native (N-1), but I am doing a doc patch to explain better _why_
it works that way.

>> Other ideas:
>> Is there any merit in being able to view the diff file as an
>> alternative method of previewing? The close link between diff and
>> merge is highlighted in the SVN book, but we do not provide any
>> facility for tree diff. Perhaps this is a good place to put it.
>>
>> Someone else commented that 'dry run' would be better as a button
>> than a checkbox, so maybe we could have 5 buttons at the bottom:
>>
>> [ Unified Diff ] [ Dry Run ] [ Merge ] [ Cancel ] [ Help ]
>>
>> Only Merge and Cancel would close the dialog.
>
> A unified diff isn't available from the merge command. Sure, we could
> use the svn_client_diff() API to get the unified diff, but what would
> that help? I mean most people can't 'read' unified diffs, and those
> who can still have to somehow apply that diff to understand it
> completely.

So why do you offer unified diffs from show log? Most people won't use
them at all, but it is another way of checking exactly which changes are
going to be made by the merge. Dry-run shows which files change, and
whether there are conflicts, but it doesn't show you what the content
change is. And people _can_ 'read' unified diffs - I sometimes glance
through the commit emails (sad person that I am) to get a flavour of
what has changed. OK, it only has minimal context, but certainly in the
doc files I can see what has been changed.

And partly it is for completeness, because it's a subversion CLI feature
which we don't support at all at the moment (tree diff, that is).

Would anyone use this if it were added? If not then there is no point.

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