You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2011/05/19 10:19:12 UTC
Re: svn commit: r1124382 - in /subversion/trunk/subversion:
include/svn_error_codes.h libsvn_client/merge.c
libsvn_ra_neon/commit.c
steveking@apache.org wrote on Wed, May 18, 2011 at 18:58:50 -0000:
> @@ -9015,7 +9015,7 @@ ensure_wc_is_suitable_merge_target(const
> }
>
> if (min_rev != max_rev)
> - return svn_error_createf(SVN_ERR_CLIENT_NOT_READY_TO_MERGE, NULL,
> + return svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
> _("Cannot merge into mixed-revision working "
> "copy [%lu:%lu]; try updating first"),
> min_rev, max_rev);
-1 unless you update svn_client_merge4()'s docstring accordingly, since
it promises a specific error code here.
Re: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h
libsvn_client/merge.c libsvn_ra_neon/commit.c
Posted by Stefan Küng <to...@gmail.com>.
On 24.05.2011 20:30, C. Michael Pilato wrote:
> On 05/19/2011 05:33 AM, Bert Huijben wrote:
>>> From: Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
>
> [...]
>
>>> -1 unless you update svn_client_merge4()'s docstring accordingly, since
>>> it promises a specific error code here.
>>
>> And I think the error code needs another _ between UPDATE and REQUIRED.
>
> I took care of these concerns on steveking's behalf in r1127198. (I rather
> doubt that he follows this list thoroughly, so in the future we should
> probably Cc: him on reviews of his commits.)
Ups, sorry. I usually monitor the emails for a while after I do a commit
and I didn't see anything that wasn't solved immediately (I can only
answer in the evening, my boss wouldn't like it if I start answering
emails during work).
I'll try to monitor the emails longer next time. But remember that it
might take almost a day until I can answer, depending on the time you
send an email.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Re: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h
libsvn_client/merge.c libsvn_ra_neon/commit.c
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 05/19/2011 05:33 AM, Bert Huijben wrote:
>> From: Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
[...]
>> -1 unless you update svn_client_merge4()'s docstring accordingly, since
>> it promises a specific error code here.
>
> And I think the error code needs another _ between UPDATE and REQUIRED.
I took care of these concerns on steveking's behalf in r1127198. (I rather
doubt that he follows this list thoroughly, so in the future we should
probably Cc: him on reviews of his commits.)
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
RE: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
> Sent: donderdag 19 mei 2011 10:19
> To: dev@subversion.apache.org
> Cc: commits@subversion.apache.org
> Subject: Re: svn commit: r1124382 - in /subversion/trunk/subversion:
> include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c
>
> steveking@apache.org wrote on Wed, May 18, 2011 at 18:58:50 -0000:
> > @@ -9015,7 +9015,7 @@ ensure_wc_is_suitable_merge_target(const
> > }
> >
> > if (min_rev != max_rev)
> > - return
> svn_error_createf(SVN_ERR_CLIENT_NOT_READY_TO_MERGE, NULL,
> > + return
> svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
> > _("Cannot merge into mixed-revision
working "
> > "copy [%lu:%lu]; try updating
first"),
> > min_rev, max_rev);
>
> -1 unless you update svn_client_merge4()'s docstring accordingly, since
> it promises a specific error code here.
And I think the error code needs another _ between UPDATE and REQUIRED.
Bert
RE: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Daniel Shahaf [mailto:d.s@daniel.shahaf.name]
> Sent: donderdag 19 mei 2011 10:19
> To: dev@subversion.apache.org
> Cc: commits@subversion.apache.org
> Subject: Re: svn commit: r1124382 - in /subversion/trunk/subversion:
> include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c
>
> steveking@apache.org wrote on Wed, May 18, 2011 at 18:58:50 -0000:
> > @@ -9015,7 +9015,7 @@ ensure_wc_is_suitable_merge_target(const
> > }
> >
> > if (min_rev != max_rev)
> > - return
> svn_error_createf(SVN_ERR_CLIENT_NOT_READY_TO_MERGE, NULL,
> > + return
> svn_error_createf(SVN_ERR_CLIENT_MERGE_UPDATEREQUIRED, NULL,
> > _("Cannot merge into mixed-revision
working "
> > "copy [%lu:%lu]; try updating
first"),
> > min_rev, max_rev);
>
> -1 unless you update svn_client_merge4()'s docstring accordingly, since
> it promises a specific error code here.
And I think the error code needs another _ between UPDATE and REQUIRED.
Bert