On 19 Sep 2005 21:03:09 -0500, kfogel@collab.net <kfogel@collab.net> wrote:
>
> "C. Michael Pilato" <cmpilato@collab.net> writes:
> > > /* If any of the three entries is of type file, flag a conflict. */
> > > - if (s_entry->kind == svn_node_file
> > > - || t_entry->kind == svn_node_file
> > > - || a_entry->kind == svn_node_file)
> > > + if ((svn_fs_base__dag_node_kind (s_ent_node) == svn_node_file)
> > > + || (svn_fs_base__dag_node_kind (t_ent_node) == svn_node_file)
> > > + || (svn_fs_base__dag_node_kind (a_ent_node) == svn_node_file))
> > > return conflict_err (conflict_p,
> > > svn_path_join (target_path,
> > > a_entry->name,
> >
> > In case anyone was wondering, I verified this problem by adding the
> > following just above the block I changed in the commit:
> >
> > if (s_entry->kind != svn_node_unknown
> > || t_entry->kind != svn_node_unknown
> > || a_entry->kind != svn_node_unknown)
> > return svn_error_create (SVN_ERR_FS_CORRUPT, NULL,
> > "Got something other than unknowns");
> >
> > I ran the test suite, and I never saw that error fire, so I knew that
> > the 'kind' fields were always svn_node_unknown (and therefore checking
> > them against svn_node_file would not be entirely useful).
>
> Nice! I *was* actually wondering, and that's a great way to test it.
> (For extra credit, put the tmp change back and try stress.pl :-) ).
>
I'm getting compiler warnings here (that look accurate to me) indicating
that s_ent_node, t_ent_node, and a_ent_node are being used without being
initialized?
DJ
Received on Wed Sep 21 06:05:08 2005