Checkout
pburba
committed
on 24 Sep 12
On the inheritable-props branch: Sync with ^/subversion/trunk through
r1389356.

Resolve some minor conflicts with the incoming bump to WC f… Show more
On the inheritable-props branch: Sync with ^/subversion/trunk through

r1389356.

Resolve some minor conflicts with the incoming bump to WC format 30 (see

r1387742).  We had already made that bump on this branch to support a schema

change required for iprops (see r1376154 and r1376924).  With this sync, the

latter change is now part of the bump to format 31.

Show less