You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/01/24 02:26:50 UTC
svn commit: r1560869 - in /subversion/branches/1.8.x: ./
subversion/include/svn_client.h
Author: breser
Date: Fri Jan 24 01:26:49 2014
New Revision: 1560869
URL: http://svn.apache.org/r1560869
Log:
Merge r1468109 from trunk: documentation fix
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/subversion/include/svn_client.h
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1468109
Modified: subversion/branches/1.8.x/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_client.h?rev=1560869&r1=1560868&r2=1560869&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_client.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_client.h Fri Jan 24 01:26:49 2014
@@ -439,7 +439,11 @@ typedef struct svn_client_commit_info_t
#define SVN_CLIENT_COMMIT_ITEM_TEXT_MODS 0x04
#define SVN_CLIENT_COMMIT_ITEM_PROP_MODS 0x08
#define SVN_CLIENT_COMMIT_ITEM_IS_COPY 0x10
-/** @since New in 1.2. */
+/** One of the flags for a commit item. The node has a lock token that
+ * should be released after a successful commit and, if the node is also
+ * modified, transferred to the server as part of the commit process.
+ *
+ * @since New in 1.2. */
#define SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN 0x20
/** @since New in 1.8. */
#define SVN_CLIENT_COMMIT_ITEM_MOVED_HERE 0x40