Re: svn commit: r16940 - in branches/wc-propcaching: subversion/libsvn_wc

On 10/23/05, Erik Huelsmann <ehuels@gmail.com> wrote:
> On 10/23/05, zhakov@tigris.org <zhakov@tigris.org> wrote:
> > Author: zhakov
> > Date: Sun Oct 23 08:28:56 2005
> > New Revision: 16940
> >
> > Added:
> > branches/wc-propcaching/TODO
> > - copied unchanged from r15510, /branches/wc-propcaching/TODO
> > Modified:
> > branches/wc-propcaching/subversion/libsvn_wc/lock.c
> > branches/wc-propcaching/subversion/libsvn_wc/wc.h
> >
> > Log:
> > Merge r15503-15510 (all changes) from the old branch.
> >
> > Modified: branches/wc-propcaching/subversion/libsvn_wc/lock.c
> > Url: http://svn.collab.net/viewcvs/svn/branches/wc-propcaching/subversion/libsvn_wc/lock.c?rev=16940&p1=branches/wc-propcaching/subversion/libsvn_wc/lock.c&p2=branches/wc-propcaching/subversion/libsvn_wc/lock.c&r1=16939&r2=16940
> > ==============================================================================
> > --- branches/wc-propcaching/subversion/libsvn_wc/lock.c (original)
> > +++ branches/wc-propcaching/subversion/libsvn_wc/lock.c Sun Oct 23 08:28:56 2005
> > @@ -106,6 +106,11 @@
> > adm_access->path,
> > pool));
> >
> > + /* ### TODO: upgrade from format 5 to format 6. */
> > + /* ### Upgrading currently disabled. */
> > +
> > + return SVN_NO_ERROR;
> > +
> > /* We can upgrade all formats that are accepted by
> > svn_wc__check_format. */
> > if (adm_access->wc_format != SVN_WC__VERSION)
> >
> > Modified: branches/wc-propcaching/subversion/libsvn_wc/wc.h
> > Url: http://svn.collab.net/viewcvs/svn/branches/wc-propcaching/subversion/libsvn_wc/wc.h?rev=16940&p1=branches/wc-propcaching/subversion/libsvn_wc/wc.h&p2=branches/wc-propcaching/subversion/libsvn_wc/wc.h&r1=16939&r2=16940
> > ==============================================================================
> > --- branches/wc-propcaching/subversion/libsvn_wc/wc.h (original)
> > +++ branches/wc-propcaching/subversion/libsvn_wc/wc.h Sun Oct 23 08:28:56 2005
> > @@ -60,10 +60,15 @@
> > * The change from 4 to 5 was the addition of support for replacing files
> > * with history.
> > *
> > + * The change from 5 to 6 was the introduction of caching of property
> > + * modification state and certain properties in the entries file.
> > + *
> > * Please document any further format changes here.
> > */
> > -#define SVN_WC__VERSION 5
> > +#define SVN_WC__VERSION 6
> trunk has already been bumped wrt 1.3.x; another bump is not required
> iff you merge the branch back before 1.4.
If the wc-propcaching branch is merged to trunk without a WC format
bump, would working copies created by our current trunk client still
work? What would happen?

Cheers,

David

--
David James -- http://www.cs.toronto.edu/~james