2009-02-14 11:47:54 Greg Stein napisał(a):
> You could have manually made the change on trunk. When merging to the
> branch, the text would have matched, so it would not have raised a
> conflict. And same when the branch was reintegrated.
>
> You could still go in and delete the mergeinfo, right?
+1.
>
> On Sat, Feb 14, 2009 at 05:55, Hyrum K. Wright <hyrum_at_hyrumwright.org> wrote:
> > Author: hwright
> > Date: Fri Feb 13 20:55:17 2009
> > New Revision: 35873
> >
> > Log:
> > Cherry pick r35637 from the explore-wc branch to trunk for wc-metadata.sql.
> >
> > *sigh* this creates subtree mergeinfo.
> >
> > Modified:
> > trunk/subversion/libsvn_wc/wc-metadata.sql (contents, props changed)
> >
> > Modified: trunk/subversion/libsvn_wc/wc-metadata.sql
> > URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/wc-metadata.sql?pathrev=35873&r1=35872&r2=35873
> > ==============================================================================
> > --- trunk/subversion/libsvn_wc/wc-metadata.sql Fri Feb 13 20:30:33 2009 (r35872)
> > +++ trunk/subversion/libsvn_wc/wc-metadata.sql Fri Feb 13 20:55:17 2009 (r35873)
> > @@ -45,8 +45,8 @@ CREATE TABLE REPOSITORY (
> > CREATE TABLE WCROOT (
> > id INTEGER PRIMARY KEY AUTOINCREMENT,
> >
> > - /* absolute path in the local filesystem */
> > - local_abspath TEXT NOT NULL
> > + /* absolute path in the local filesystem. NULL if storing metadata in the wc */
> > + local_abspath TEXT
> > );
> >
> > CREATE UNIQUE INDEX I_LOCAL_ABSPATH ON WCROOT (local_abspath);
--
Arfrever Frehtes Taifersar Arahesis
Received on 2009-02-14 18:21:30 CET