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

Re: [tortoisesvn] r25285 committed - TortoiseMerge: Use left file except marked blocks....

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Mon, 10 Mar 2014 22:26:10 +0000

Well it is correct but it is still confusing IMHO. The word 'except'
implies leaving something out so you are effectively saying 'get rid
of all the changes except the ones I marked', or 'mark the changes
that you don't want to be left out' which is a double negative. To me
it makes more sense to say a positive statement referring to the
original state of the file. 'Use the original file, plus the changes I
marked'.

Simon

On 10 March 2014 19:13, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 10.03.2014 16:28, Simon Large wrote:
>> "Use left file except marked blocks" is correct but confusing. It
>> sounds exactly like what you were trying to avoid, i.e. undoing the
>> marked bits and keeping the rest. How about "Use left file plus marked
>> changes".
>
> I think "use left file except marked blocks" is correct: that way you
> can mark the blocks for excluding.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074298
>
> To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074310

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-10 23:26:21 CET

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.