You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/09/14 12:08:36 UTC
svn commit: r996811 - in /subversion/trunk/subversion/libsvn_wc: upgrade.c
wc.h
Author: rhuijben
Date: Tue Sep 14 10:08:35 2010
New Revision: 996811
URL: http://svn.apache.org/viewvc?rev=996811&view=rev
Log:
Move some defines that are only used on upgrades from wc.h to upgrade.c.
* subversion/libsvn_wc/upgrade.c
(SVN_WC__BASE_EXT,
SVN_WC__WORK_EXT,
SVN_WC__REVERT_EXT): Move here...
* subversion/libsvn_wc/wc.h
(SVN_WC__BASE_EXT,
SVN_WC__WORK_EXT,
SVN_WC__REVERT_EXT): ... from here.
Modified:
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=996811&r1=996810&r2=996811&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Sep 14 10:08:35 2010
@@ -42,6 +42,11 @@
#include "private/svn_sqlite.h"
#include "private/svn_token.h"
+/* WC-1.0 administrative area extensions */
+#define SVN_WC__BASE_EXT ".svn-base" /* for text and prop bases */
+#define SVN_WC__WORK_EXT ".svn-work" /* for working propfiles */
+#define SVN_WC__REVERT_EXT ".svn-revert" /* for reverting a replaced
+ file */
/* Old locations for storing "wcprops" (aka "dav cache"). */
#define WCPROPS_SUBDIR_FOR_FILES "wcprops"
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=996811&r1=996810&r2=996811&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue Sep 14 10:08:35 2010
@@ -44,19 +44,13 @@ extern "C" {
#define SVN_WC__PROP_REJ_EXT ".prej"
-#define SVN_WC__BASE_EXT ".svn-base" /* for text and prop bases */
-#define SVN_WC__WORK_EXT ".svn-work" /* for working propfiles */
-#define SVN_WC__REVERT_EXT ".svn-revert" /* for reverting a replaced
- file */
-
-
/* We can handle this format or anything lower, and we (should) error
* on anything higher.
*
* There is no format version 0; we started with 1.
*
- * The change from 1 to 2 was the introduction of SVN_WC__WORK_EXT.
+ * The change from 1 to 2 was the introduction of the ".svn-work" extension.
* For example, ".svn/props/foo" became ".svn/props/foo.svn-work".
*
* The change from 2 to 3 was the introduction of the entry attribute
Re: svn commit: r996811 - in /subversion/trunk/subversion/libsvn_wc:
upgrade.c wc.h
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Sep 14, 2010 at 06:08, <rh...@apache.org> wrote:
> Author: rhuijben
> Date: Tue Sep 14 10:08:35 2010
> New Revision: 996811
>
> URL: http://svn.apache.org/viewvc?rev=996811&view=rev
> Log:
> Move some defines that are only used on upgrades from wc.h to upgrade.c.
>
> * subversion/libsvn_wc/upgrade.c
> (SVN_WC__BASE_EXT,
> SVN_WC__WORK_EXT,
> SVN_WC__REVERT_EXT): Move here...
In the past, I've dropped the SVN prefix when these became local.
Cheers,
-g