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

Re: svn commit: r32804 - in trunk/subversion: include libsvn_wc

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 04 Sep 2008 18:58:56 +0100

On Tue, 2008-09-02 at 19:45 +0100, Julian Foad wrote:
> On Tue, 2008-09-02 at 12:52 -0400, Karl Fogel wrote:
> > julianfoad_at_tigris.org writes:
> > > --- subversion/include/svn_wc.h (revision 32795)
> > > +++ subversion/include/svn_wc.h (working copy)
> > > @@ -1176,6 +1187,47 @@ typedef struct svn_wc_conflict_descripti
> > >
> > > } svn_wc_conflict_description_t;
> > >
> > > +/**
> > > + * Allocate an @c svn_wc_conflict_description_t structure in @a pool,
> > > + * initialize to represent a text conflict, and return it.
> > > + *
> > > + * Set the @c path field of the created struct to @a path, the @c access
> > > + * field to @a adm_access, the @c kind field to @c
> > > + * svn_wc_conflict_kind_text, the @c node_kind to @c svn_node_file, the @c
> > > + * action to @c svn_wc_conflict_action_edit, and the @c reason to @c
> > > + * svn_wc_conflict_reason_edited.
> > > + *
> > > + * @note: It is the caller's responsibility to set the other required fields
> > > + * (such as the four file names and @c mime_type and @c is_binary).
> > > + *
> > > + * @since New in 1.6.
> > > + */
> > > +svn_wc_conflict_description_t *
> > > +svn_wc_conflict_description_create_text(const char *path,
> > > + svn_wc_adm_access_t *adm_access,
> > > + apr_pool_t *pool);
> >
> > Is @a path stored by reference, or is its value copied into @a pool?
> > Doc string should say.
>
> Thanks for catching this. Same applies to some other constructors that
> we have.
>
> Is the attached patch "shallow-copy-1.patch" OK?

It seemed safe enough to me. Committed in r32905.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-04 19:59:13 CEST

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