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

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

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-25 17:52:57 CET

Simon Large wrote:

> The new dialog overcomes much of the earlier To/From confusion. The
> other issue is the use of (N-1) for revision ranges, which novice users
> (like me) find non-intuitive. One method which might help is to add
> _another_ button close to the 'Use "From:" URL' checkbox which is only
> enabled when that box is checked, whose function is to allow selection
> of the revision range exactly as Stefan did in the previous attempt. If
> I click on this button and select revs 2457 - 2468 and click OK, "From:"
> is set to 2456 and "To:" is set to 2468. I am not sure what title to
> give this button. Maybe 'Select revision range'. Or maybe 'OneClick -
> tortoisesvn.tigris.org and you're done'. But I admit it could be
> confusing having this as well as the two 'show log' buttons.

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... ;)

> 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.

Stefan

-- 
        ___
   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 Tue Jan 25 17:53:45 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.