Ivan Zhakov <i...@visualsvn.com> writes: > On 2 January 2015 at 18:59, Philip Martin <philip.mar...@wandisco.com> wrote: >> Ivan Zhakov <i...@visualsvn.com> writes: >> >>> Do I understand correctly that you have merged branch without >>> resolving concerns about dirent_t structure naming raised dev@ list >>> two weeks ago [1] ? >> >> The names appear to have been changed (dirent_t to svn_fs_x__dirent_t) >> as part of the merge commit. >> > What commit do you mean? > > I see the following in this diff email: > [[[ > @@ -2411,8 +2407,8 @@ sorted(apr_array_header_t *entries) > static int > compare_dirents(const void *a, const void *b) > { > - const svn_fs_dirent_t *lhs = *((const svn_fs_dirent_t * const *) a); > - const svn_fs_dirent_t *rhs = *((const svn_fs_dirent_t * const *) b); > + const dirent_t *lhs = *((const dirent_t * const *) a); > + const dirent_t *rhs = *((const dirent_t * const *) b); > > return strcmp(lhs->name, rhs->name); > } > ]]]
My mistake, I was looking at libsvn_fs_fs/fs.h in my tree and saw the rename, but it occurred later in r1649062. -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*