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

[TSVN] Re: Small bug in commit dialog

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2005-02-10 13:55:36 CET

Simon Large wrote:

>Peter McNab wrote:
>
>
>>Just wondering what "Automatically close if no merges" actually
>>means"? If I'm attempting a merging is that something that couild
>>actually occur? If there is a conflict, does that equate to no merge?
>>Why not have the tickbox on the merge form itself?
>>
>>
>
>No, this is refering to the fact that when you update, if someone else
>has changed a file that you are also working on, their changes get
>merged into yours in your WC. That's part of the update process. It's
>not talking about the SVN merge command specifically.
>
>Simon
>
>
>
Thanks Simon.

So are you saying that the above pertains to the situation when my WC is
modified and not yet committed and someone else has modified the
repository, so if I rightclick and select "Update" then the repository
changes are automatically merged into my WC. (Well attempted anyway
unless there are conflicts).

I'm not inclined to suggest wording for the choices. Getting GUI
prompts right can be very difficult indeed.
My only "suggestion" is that it should not be necessary to read all the
selections to interpret the one you wish to apply.

However, what's the thought behind using a combobox for the selector.
Isn't there a notion you could type something else in the box as an
alternative to the preset choices.
Are radio buttons too difficult?

Peter
Received on Thu Feb 10 13:56:26 2005

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