On Tue, Aug 25, 2009 at 01:39:35PM +0200, Daniel Näslund wrote:
> On Tue, Aug 25, 2009 at 12:04:12PM +0100, Stefan Sperling wrote:
> > > [[[
> > > Follow up to r38893. Changed svn_node_kind_t to use the kind of the
> > > entry rather than the kind of the node on disk.
> >
> > Drive-by remark about the log message.
> >
> > "Changed svn_node_kind_t" could probably be worded better.
> > When read in isolation it sounds like you changed the data type
> > itself. But rather, you've changed the meaning of a parameter
> > of a function. So let's say so:
> >
> > Follow up to r38893. Change the KIND parameter of svn_wc__maybe_get_entry()
> > to mean the kind of the entry rather than the kind of the node on disk.
>
> Point taken. I shamelessly steal your wordings.
>
> [[[
> Follow up to r38893. Change the KIND parameter of svn_wc__maybe_get_entry()
> to mean the kind of the entry rather than the kind of the node on disk.
>
> * subversion/libsvn_client/patch.c
> (merge_file_changed, merge_file_added): Set kind to svn_node_file.
> (merge_dir_added): Set kind to svn_node_dir.
> (init_patch_target): Set kind to svn_node_file.
> ]]]
>
> Another question:
> > Why does this patch not change svn_wc__maybe_get_entry() itself?
> > Does its behaviour not change? (Sorry if I am being stupid asking this,
> > I haven't read the entire discussion).
>
> The thing is that svn_wc__maybe_get_entry() wraps
> svn_wc__get_entry_versioned(). And that function catches an
> SVN_ERR_NODE_UNEXPECTED_KIND. In the end that error is cleared and a
> null entry is returned. So if the expected kind is set to the wrong sort
> we may end up with a versioned node appearing as not versioned at all.
Ah, so you are adjusting callers of svn_wc__maybe_get_entry() to
*existing* behaviour of svn_wc__maybe_get_entry().
Then this might be a better log message?
Follow up to r38893. The KIND parameter of svn_wc__maybe_get_entry()
means the kind of the entry rather than the kind of the node on disk.
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2387055
Received on 2009-08-26 23:56:21 CEST