Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: svn commit: r35873 - trunk/subversion/libsvn_wc

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

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

Author gstein
Full name Greg Stein
Date 2009-02-14 02:48:14 PST
Message 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 dot 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/lib​svn_wc/wc-metadata.s​ql (contents, props changed)
>
> Modified: trunk/subversion/lib​svn_wc/wc-metadata.s​ql
> URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/libsvn_wc/​wc-metadata.sql?path​rev=35873&r1=358​72&r2=35873
> ====================​====================​====================​==================
> --- trunk/subversion/lib​svn_wc/wc-metadata.s​ql Fri Feb 13 20:30:33 2009 (r35872)
> +++ trunk/subversion/lib​svn_wc/wc-metadata.s​ql 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.ti​gris.org/ds/viewMess​age.do?dsForumId=495​&dsMessageId=115​5484
>

« Previous message in topic | 1 of 3 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
Re: svn commit: r35873 - trunk/subversion/libsvn_wc gstein Greg Stein 2009-02-14 02:48:14 PST
     Re: svn commit: r35873 - trunk/subversion/libsvn_wc arfrever Arfrever Frehtes Taifersar Arahesis 2009-02-14 09:21:09 PST
     Re: svn commit: r35873 - trunk/subversion/libsvn_wc stsp Stefan Sperling 2009-02-16 23:06:30 PST
Messages per page: