You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/02/14 10:47:54 UTC
Re: svn commit: r35873 - trunk/subversion/libsvn_wc
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?
On Sat, Feb 14, 2009 at 05:55, Hyrum K. Wright <hy...@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);
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1155484
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1157160
Re: svn commit: r35873 - trunk/subversion/libsvn_wc
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Feb 14, 2009 at 11:47:54AM +0100, Greg Stein wrote:
> 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?
Is cherry-picking from a branch to trunk, and then later reintegrating the
branch back into trunk, even supported by the current merge-tracking
implementation? As far as I understood, this was one of the harder use
cases the current implementation does not support well.
Stefan
> On Sat, Feb 14, 2009 at 05:55, Hyrum K. Wright <hy...@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);
> >
> > ------------------------------------------------------
> > http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1155484
> >
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1157160
Re: svn commit: r35873 - trunk/subversion/libsvn_wc
Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
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 <hy...@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