You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/15 14:06:17 UTC
svn commit: r1147112 - in /subversion/branches/1.7.x: ./ STATUS
subversion/include/svn_client.h
Author: hwright
Date: Fri Jul 15 12:06:16 2011
New Revision: 1147112
URL: http://svn.apache.org/viewvc?rev=1147112&view=rev
Log:
Merge r1146620 from trunk:
* r1146620
Simple consistency for the 'svn_client_info2_t' structure; no functional
change. On the 'wc_info' member, remove 'struct' keyword, as we don't
use it in any other similar situation.
Notes:
This change also marks the doc string for Doxygen, an 'obvious fix'.
Votes:
+1: julianfoad, rhuijben, gstein
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/include/svn_client.h
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 12:06:16 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555
+/subversion/trunk:1146013,1146219,1146222,1146274,1146492,1146555,1146620
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1147112&r1=1147111&r2=1147112&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 15 12:06:16 2011
@@ -56,15 +56,6 @@ Candidate changes:
Approved changes:
=================
- * r1146620
- Simple consistency for the 'svn_client_info2_t' structure; no functional
- change. On the 'wc_info' member, remove 'struct' keyword, as we don't
- use it in any other similar situation.
- Notes:
- This change also marks the doc string for Doxygen, an 'obvious fix'.
- Votes:
- +1: julianfoad, rhuijben, gstein
-
* r1146684
Report the right wcroot in an 'svn upgrade' error message.
Justification:
Modified: subversion/branches/1.7.x/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/svn_client.h?rev=1147112&r1=1147111&r2=1147112&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/include/svn_client.h (original)
+++ subversion/branches/1.7.x/subversion/include/svn_client.h Fri Jul 15 12:06:16 2011
@@ -5390,8 +5390,8 @@ typedef struct svn_client_info2_t
/** An exclusive lock, if present. Could be either local or remote. */
const svn_lock_t *lock;
- /* Possible information about the working copy, NULL if not valid. */
- const struct svn_wc_info_t *wc_info;
+ /** Possible information about the working copy, NULL if not valid. */
+ const svn_wc_info_t *wc_info;
} svn_client_info2_t;