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

[TSVN] Re: Merge dialog, second attempt

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-25 14:23:30 CET

Mark Phippard wrote:
> SteveKing <steveking@gmx.ch> wrote on 01/24/2005 02:07:17 PM:
>> So since some people don't want the revisions to merge entered (no
>> matter how it is dome) but the range specified the same way as the
>> CL client I've created another merge dialog.
>> To be honest, I've already committed that change. Even if it doesn't
>> get your ok, it's better than what we have now and we can always
>> improve it further if we ever get to an agreement on how it should
>> look/work.
> I agree it will be an improvement. Thanks.

Looks better to me too.

> In the text for "To:" you are missing the word "and" between URL and
> revision.

And "points to the repository at the URL:" I think would be better
without _the_.

> I will respect your wish to not discuss remembering previous merges,
> but I do not completely agree that this is what Subversion means by
> merge tracking and that everything must wait until they implement it.

The danger in doing a poor-man's merge tracking is that people will
think it is the real thing. We could implement a scheme that simply
saves the last revision I merged, but if someone else does a merge as
well, I have no record of that, and could be misled into thinking that
TSVN has checked on the server.

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.

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.


  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 14:23:38 2005

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