You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Julian Foad <ju...@btopenworld.com> on 2010/04/08 10:14:34 UTC

Re: svn commit: r931798 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

gstein@apache.org wrote:
> Author: gstein
> Date: Thu Apr  8 07:11:58 2010
> New Revision: 931798

> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=931798&r1=931797&r2=931798&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Apr  8 07:11:58 2010
> @@ -4257,6 +4257,7 @@ install_text_base(svn_stringbuf_t **log_
>  static svn_error_t *
>  merge_file(svn_stringbuf_t **log_accum,
>             svn_boolean_t *install_pristine,
> +           const char **install_from,

Please document the new parameters.

- Julian


Re: svn commit: r931798 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

Posted by Greg Stein <gs...@gmail.com>.
On Thu, Apr 8, 2010 at 07:34, Julian Foad <ju...@wandisco.com> wrote:
> I (Julian Foad) wrote:
>> gstein@apache.org wrote:
>> > Author: gstein
>> > Date: Thu Apr  8 07:11:58 2010
>> > New Revision: 931798
>>
>> > Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
>> > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=931798&r1=931797&r2=931798&view=diff
>> > ==============================================================================
>> > --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
>> > +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Apr  8 07:11:58 2010
>> > @@ -4257,6 +4257,7 @@ install_text_base(svn_stringbuf_t **log_
>> >  static svn_error_t *
>> >  merge_file(svn_stringbuf_t **log_accum,
>> >             svn_boolean_t *install_pristine,
>> > +           const char **install_from,
>>
>> Please document the new parameters.
>
> This looks odd... the new parameters are being used to install a new
> *working* file, not a new pristine file (although the new working file
> is sometimes a copy of the pristine file).

svn_boolean_t *install_from_pristine might be more appropriate.

*shrug*

Re: svn commit: r931798 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

Posted by Julian Foad <ju...@wandisco.com>.
I (Julian Foad) wrote:
> gstein@apache.org wrote:
> > Author: gstein
> > Date: Thu Apr  8 07:11:58 2010
> > New Revision: 931798
> 
> > Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=931798&r1=931797&r2=931798&view=diff
> > ==============================================================================
> > --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> > +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Apr  8 07:11:58 2010
> > @@ -4257,6 +4257,7 @@ install_text_base(svn_stringbuf_t **log_
> >  static svn_error_t *
> >  merge_file(svn_stringbuf_t **log_accum,
> >             svn_boolean_t *install_pristine,
> > +           const char **install_from,
> 
> Please document the new parameters.

This looks odd... the new parameters are being used to install a new
*working* file, not a new pristine file (although the new working file
is sometimes a copy of the pristine file).

- Julian