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

Re: svn commit: r1489203 - /subversion/trunk/subversion/libsvn_client/merge.c

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 04 Jun 2013 19:40:27 +0200

On 04.06.2013 17:50, Julian Foad wrote:
> Greg Stein wrote:
>
>> Would "%s@%ld and %s@%ld must have a common ancestor" be easier to
>> translate?
>>
>> The term "ancestrally related" seems a bit complicated for
>> translation :-P
>
> Your suggestion is a better message, I agree.
>
> The present error code and error message exactly duplicate one that
> is already used in 'reintegrate'. As this is in the library, the
> message is perhaps less important than the error code. We can tweak
> the message, but perhaps we should also make it possible for the
> caller to distinguish this case, by using a different error code such
> as 'SVN_ERR_CLIENT_UNRELATED_RESOURCES' (which is already for cases
> such as source and target being in different repositories), or even a
> new one.
>
> Stefan K or other GUI people, do you have an opinion on this?

Using 'SVN_ERR_CLIENT_UNRELATED_RESOURCES' is fine with me.
Thanks btw for fixing this.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
Received on 2013-06-04 19:41:04 CEST

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