Author: danielsh
Date: Fri Jul 23 21:20:04 2010
New Revision: 967266
URL: http://svn.apache.org/viewvc?rev=967266&view=rev
Log:
On the 'atomic-revprop' branch, merge r967213 through r967265 from trunk.
Modified:
subversion/branches/atomic-revprop/ (props changed)
subversion/branches/atomic-revprop/subversion/include/svn_error.h
subversion/branches/atomic-revprop/subversion/libsvn_wc/wc_db.c
subversion/branches/atomic-revprop/subversion/libsvn_wc/workqueue.c
Propchange: subversion/branches/atomic-revprop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 23 21:20:04 2010
@@ -34,4 +34,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:965046-967212
+/subversion/trunk:965046-967265
Modified: subversion/branches/atomic-revprop/subversion/include/svn_error.h
URL:
http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/include/svn_error.h?rev=967266&r1=967265&r2=967266&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/include/svn_error.h (original)
+++ subversion/branches/atomic-revprop/subversion/include/svn_error.h Fri Jul
23 21:20:04 2010
@@ -444,6 +444,9 @@ svn_error_t *svn_error_purge_tracing(svn
} \
} while (0)
+/** Report a "Not implemented" malfunction. Internal use only. */
+#define SVN__NOT_IMPLEMENTED() \
+ return svn_error__malfunction(TRUE, __FILE__, __LINE__, "Not implemented.")
/** A helper function for the macros that report malfunctions. Handle a
* malfunction by calling the current "malfunction handler" which may have
Modified: subversion/branches/atomic-revprop/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_wc/wc_db.c?rev=967266&r1=967265&r2=967266&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_wc/wc_db.c Fri Jul 23
21:20:04 2010
@@ -52,8 +52,7 @@
#include "private/svn_token.h"
-#define NOT_IMPLEMENTED() \
- return svn_error__malfunction(TRUE, __FILE__, __LINE__, "Not implemented.")
+#define NOT_IMPLEMENTED() SVN__NOT_IMPLEMENTED()
/*
Modified: subversion/branches/atomic-revprop/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_wc/workqueue.c?rev=967266&r1=967265&r2=967266&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_wc/workqueue.c
(original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_wc/workqueue.c Fri Jul
23 21:20:04 2010
@@ -41,10 +41,6 @@
#include "private/svn_skel.h"
-#define NOT_IMPLEMENTED() \
- return svn_error__malfunction(TRUE, __FILE__, __LINE__, "Not implemented.")
-
-
/* Workqueue operation names. */
#define OP_REVERT "revert"
#define OP_PREPARE_REVERT_FILES "prep-rev-files"
@@ -356,7 +352,7 @@ run_revert(svn_wc__db_t *db,
}
else if (kind == svn_wc__db_kind_symlink)
{
- NOT_IMPLEMENTED();
+ SVN__NOT_IMPLEMENTED();
}
if (kind == svn_wc__db_kind_dir)
