[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35873 - trunk/subversion/libsvn_wc

From: Greg Stein <gstein_at_gmail.com>
Date: Sat, 14 Feb 2009 11:47:54 +0100

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 <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);
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1155484
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1157160
Received on 2009-02-14 11:48:43 CET

This is an archived mail posted to the Subversion Dev mailing list.