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

Re: Even more merge thoughts...

From: Oto BREZINA <otik_at_printflow.eu>
Date: Tue, 29 Nov 2011 21:38:54 +0100

On 2011-11-29 12:31, Hans-Emil Skogh wrote:
> Hi all!
>
> Now with svn 1.7.2 coming up this might not be the best timing to come dragging with some more merge thoughts. But hey, is there ever a good time? :-)
>
> Here are a few points that have come up during this round of merges:
>
> - The Merge dialog contains the helpful hint "To merge all revisions, leave the box empty.". I have to keep remind people that this is indeed the case, and there's no need to enter any revision numbers if it's not cherry picking that we are after.
> Maybe it would be a good idea to add a checkbox that says something like "Merge all revisions", that is checked by default and hides/grays out the rest of the "Revision range to merge" controls. Unchecking this box would enable/show the controls again.
> This would make it clear even for new users that SVN will by default help you with the merging and there is no need to do select anything explicitly if you don't want to.
I see two solution here:
  * rename it to "limit merge to"
  * fill it with 1-HEAD on default

-- 
Oto BREZINA
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2889132
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-29 21:39:02 CET

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