Re: svn commit: r1509917 [1/2] - in /subversion/branches/fsfs-improvements: ./ build/generator/ subversion/ subversion/include/ subversion/include/private/ subversion/libsvn_fs/ subversion/libsvn_fs_base/ subversion/libsvn_fs_x/ subversion/libsvn_subr/ sub...

[Philip Martin <ph...@wandisco.com>]

stefan2@apache.org writes:

> Author: stefan2
> Date: Sat Aug  3 00:08:31 2013
> New Revision: 1509917
>
> URL: http://svn.apache.org/r1509917
> Log:
> On the fsfs-improvements branch: sync with /trunk.
> Resolve a trivial conflict in svn_error_codes.h

This brings fsx into the fsfs-improvements branch, but that branch has
root_vtable_t.dir_optimal_order so this code in libsvn_fsx/tree.c is
wrong on the fsfs-improvements branch:

  x_dir_entries,
/*  x_dir_optimal_order,*/
  x_make_dir,

I think it should be un-commented.

-- 
Philip Martin | Subversion Committer
WANdisco | Non-Stop Data

Re: svn commit: r1509917 [1/2] - in /subversion/branches/fsfs-improvements: ./ build/generator/ subversion/ subversion/include/ subversion/include/private/ subversion/libsvn_fs/ subversion/libsvn_fs_base/ subversion/libsvn_fs_x/ subversion/libsvn_subr/ sub...

[Stefan Fuhrmann <st...@wandisco.com>]

On Tue, Aug 6, 2013 at 5:44 PM, Philip Martin <ph...@wandisco.com>wrote:

> stefan2@apache.org writes:
>
> > Author: stefan2
> > Date: Sat Aug  3 00:08:31 2013
> > New Revision: 1509917
> >
> > URL: http://svn.apache.org/r1509917
> > Log:
> > On the fsfs-improvements branch: sync with /trunk.
> > Resolve a trivial conflict in svn_error_codes.h
>
> This brings fsx into the fsfs-improvements branch, but that branch has
> root_vtable_t.dir_optimal_order so this code in libsvn_fsx/tree.c is
> wrong on the fsfs-improvements branch:
>
>   x_dir_entries,
> /*  x_dir_optimal_order,*/
>   x_make_dir,
>
> I think it should be un-commented.
>

Committed in r1511145. Thanks!

-- Stefan^2.