You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/03/02 18:08:28 UTC
svn commit: r1663364 - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_delta/
Author: julianfoad
Date: Mon Mar 2 17:08:27 2015
New Revision: 1663364
URL: http://svn.apache.org/r1663364
Log:
On the 'move-tracking-2' branch: correct file names and #include guards,
including one error that prevented compilation.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h Mon Mar 2 17:08:27 2015
@@ -20,14 +20,14 @@
* ====================================================================
* @endcopyright
*
- * @file svn_editor3.h
+ * @file svn_editor3e.h
* @brief Tree editing
*
* @since New in 1.10.
*/
-#ifndef SVN_EDITOR3_H
-#define SVN_EDITOR3_H
+#ifndef SVN_EDITOR3E_H
+#define SVN_EDITOR3E_H
#include <apr_pools.h>
@@ -1225,4 +1225,4 @@ svn_editor3__insert_shims(
}
#endif /* __cplusplus */
-#endif /* SVN_EDITOR3_H */
+#endif /* SVN_EDITOR3E_H */
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h Mon Mar 2 17:08:27 2015
@@ -20,7 +20,7 @@
* ====================================================================
* @endcopyright
*
- * @file svn_editor3paths.h
+ * @file svn_editor3p.h
* @brief Tree editing
*
* @since New in 1.10.
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * branching.c : Element-Based Branching and Move Tracking.
+ * branch.c : Element-Based Branching and Move Tracking.
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * compat3b.c : Ev3-to-Ev1 compatibility via element-based branching.
+ * compat3e.c : Ev3-to-Ev1 compatibility via element-based branching.
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * compat3.c : Ev3-to-Ev1 compatibility.
+ * compat3p.c : Ev3-to-Ev1 compatibility.
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * editor.c : editing trees of versioned resources
+ * editor3e.c : editing trees of versioned resources
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * editor.c : editing trees of versioned resources
+ * editor3p.c : editing trees of versioned resources
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,8 +29,8 @@
#include "svn_dirent_uri.h"
#include "svn_props.h"
-#include "private/svn_editor3.h"
-#include "private/svn_editor3paths.h"
+#include "private/svn_editor3e.h"
+#include "private/svn_editor3p.h"
#include "svn_private_config.h"
#ifdef SVN_DEBUG
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c?rev=1663364&r1=1663363&r2=1663364&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c Mon Mar 2 17:08:27 2015
@@ -1,5 +1,5 @@
/*
- * editor.c : editing trees of versioned resources
+ * element.c : editing trees of versioned resources
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one