You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "C. Michael Pilato" <cm...@collab.net> on 2012/10/16 13:49:58 UTC

Re: renaming "symmetric merge"

On 10/16/2012 06:46 AM, Stefan Sperling wrote:
> On Tue, Oct 16, 2012 at 01:08:26AM -0000, julianfoad@apache.org wrote:
>> Author: julianfoad
>> Date: Tue Oct 16 01:08:26 2012
>> New Revision: 1398597
>>
>> URL: http://svn.apache.org/viewvc?rev=1398597&view=rev
>> Log:
>> Make the symmetric merge APIs public.
> 
> Hey Julian, are you still planning to rename these APIs from "symmetric"
> to "automatic" merge? I think "automatic" is a much better term to use
> because it is somewhat easier to understand from the user's perspective.
> Especially for new users who will start using Subversion at 1.8 or later
> releases. The term "symmetric" only makes sense to people who understand
> why "svn merge" behaviour wasn't symmetric in 1.7 and earlier releases.

I'm voting for the likes of svn_client_skynet__find_merge(),
svn_client_skynet__do_merge(), ...  ;-)

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development


Re: renaming "symmetric merge"

Posted by Julian Foad <ju...@btopenworld.com>.
I (Julian Foad) wrote:

> Stefan Sperling wrote:
>>   Hey Julian, are you still planning to rename these APIs from "symmetric"
>>   to "automatic" merge? I think "automatic" is a much better term to use
>>   because it is somewhat easier to understand from the user's perspective.
>>   Especially for new users who will start using Subversion at 1.8 or later
>>   releases. The term "symmetric" only makes sense to people who understand
>>   why "svn merge" behaviour wasn't symmetric in 1.7 and earlier releases.
> 
> Great, thanks for the feedback.  In that case, I'll do it.

r1399738.

- Julian

Re: renaming "symmetric merge"

Posted by "C. Michael Pilato" <cm...@collab.net>.
On 10/16/2012 11:01 AM, Julian Foad wrote:
> C-M Pilato wrote: 
>> I'm voting for the likes of svn_client_skynet__find_merge(),
>> svn_client_skynet__do_merge(), ...  ;-)
> 
> Erm, I'm afraid the humour is lost on me.  Not sure what's going on in your head :-)

http://en.wikipedia.org/wiki/Skynet_%28Terminator%29


-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development


Re: renaming "symmetric merge"

Posted by Julian Foad <ju...@btopenworld.com>.
Stefan Sperling wrote:

>  Hey Julian, are you still planning to rename these APIs from "symmetric"
>  to "automatic" merge? I think "automatic" is a much better term to use
>  because it is somewhat easier to understand from the user's perspective.
>  Especially for new users who will start using Subversion at 1.8 or later
>  releases. The term "symmetric" only makes sense to people who understand
>  why "svn merge" behaviour wasn't symmetric in 1.7 and earlier releases.

Great, thanks for the feedback.  In that case, I'll do it.

C-M Pilato wrote: 
> I'm voting for the likes of svn_client_skynet__find_merge(),
> svn_client_skynet__do_merge(), ...  ;-)

Erm, I'm afraid the humour is lost on me.  Not sure what's going on in your head :-)

- Julian