subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bert Huijben" <b...@qqmail.nl>
Subject RE: svn commit: r1124382 - in /subversion/trunk/subversion: include/svn_error_codes.h libsvn_client/merge.c libsvn_ra_neon/commit.c
Date Thu, 19 May 2011 09:33:22 GMT


> -----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


Mime
View raw message