subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1195773 - in /subversion/branches/1.7.x: ./ subversion/include/ subversion/libsvn_ra_serf/ subversion/svn/ subversion/svnrdump/ subversion/svnsync/
Date Tue, 01 Nov 2011 02:30:04 GMT
Author: hwright
Date: Tue Nov  1 02:30:03 2011
New Revision: 1195773

URL: http://svn.apache.org/viewvc?rev=1195773&view=rev
Log:
Merge r1189665 from trunk:

 * r1189665
   Remove comma after last element of enum definitions.
   Justification:
     Unbreaks the build for some people.
   Notes:
     After merging, run:
     perl -pi -e 's/^(\s*svn_wc__db_kind_unknown), *$/\1/' subversion/libsvn_wc/wc_db.h
   Votes:
     +1: danielsh, philip, pburba

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/include/svn_wc.h
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/blame.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/options.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/property.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c
    subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
    subversion/branches/1.7.x/subversion/svn/main.c
    subversion/branches/1.7.x/subversion/svnrdump/svnrdump.c
    subversion/branches/1.7.x/subversion/svnsync/main.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 02:30:03 2011
@@ -68,4 +68,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1187311,1188609,1189190,1189395,1189580
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090,
 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1187311,1188609,1189190,1189395,1189580,1189665

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Nov  1 02:30:03 2011
@@ -91,13 +91,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1189665
-   Remove comma after last element of enum definitions.
-   Justification:
-     Unbreaks the build for some people.
-   Notes:
-     After merging, run:
-     perl -pi -e 's/^(\s*svn_wc__db_kind_unknown), *$/\1/' subversion/libsvn_wc/wc_db.h
-   Votes:
-     +1: danielsh, philip, pburba

Modified: subversion/branches/1.7.x/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/svn_wc.h?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/include/svn_wc.h (original)
+++ subversion/branches/1.7.x/subversion/include/svn_wc.h Tue Nov  1 02:30:03 2011
@@ -1207,7 +1207,7 @@ typedef enum svn_wc_notify_action_t
 
   /** The operation skipped the path because it was conflicted.
    * @since New in 1.7. */
-  svn_wc_notify_skip_conflicted,
+  svn_wc_notify_skip_conflicted
 
 } svn_wc_notify_action_t;
 

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/blame.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/blame.c Tue Nov  1 02:30:03 2011
@@ -54,7 +54,7 @@ typedef enum blame_state_e {
   SET_PROP,
   REMOVE_PROP,
   MERGED_REVISION,
-  TXDELTA,
+  TXDELTA
 } blame_state_e;
 
 typedef struct blame_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/get_deleted_rev.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/get_deleted_rev.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/get_deleted_rev.c Tue Nov  1 02:30:03
2011
@@ -37,7 +37,7 @@
  */
 typedef enum drev_state_e {
   NONE = 0,
-  VERSION_NAME,
+  VERSION_NAME
 } drev_state_e;
 
 typedef struct drev_context_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/getdate.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/getdate.c Tue Nov  1 02:30:03 2011
@@ -48,7 +48,7 @@
  */
 typedef enum date_state_e {
   NONE = 0,
-  VERSION_NAME,
+  VERSION_NAME
 } date_state_e;
 
 typedef struct date_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocations.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocations.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocations.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocations.c Tue Nov  1 02:30:03
2011
@@ -43,7 +43,7 @@
  */
 typedef enum loc_state_e {
   REPORT,
-  LOCATION,
+  LOCATION
 } loc_state_e;
 
 typedef struct loc_state_list_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocks.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/getlocks.c Tue Nov  1 02:30:03 2011
@@ -55,7 +55,7 @@ typedef enum lock_state_e {
   OWNER,
   COMMENT,
   CREATION_DATE,
-  EXPIRATION_DATE,
+  EXPIRATION_DATE
 } lock_state_e;
 
 typedef struct lock_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/locks.c Tue Nov  1 02:30:03 2011
@@ -55,7 +55,7 @@ typedef enum lock_state_e {
   DEPTH,
   TIMEOUT,
   LOCK_TOKEN,
-  COMMENT,
+  COMMENT
 } lock_state_e;
 
 typedef struct lock_prop_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/log.c Tue Nov  1 02:30:03 2011
@@ -61,7 +61,7 @@ typedef enum log_state_e {
   REPLACED_PATH,
   DELETED_PATH,
   MODIFIED_PATH,
-  SUBTRACTIVE_MERGE,
+  SUBTRACTIVE_MERGE
 } log_state_e;
 
 typedef struct log_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/merge.c Tue Nov  1 02:30:03 2011
@@ -60,14 +60,14 @@ typedef enum merge_state_e {
   DATE,
   IGNORE_PROP_NAME,
   NEED_PROP_NAME,
-  PROP_VAL,
+  PROP_VAL
 } merge_state_e;
 
 typedef enum resource_type_e {
   UNSET,
   BASELINE,
   COLLECTION,
-  CHECKED_IN,
+  CHECKED_IN
 } resource_type_e;
 
 typedef struct merge_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/options.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/options.c Tue Nov  1 02:30:03 2011
@@ -51,7 +51,7 @@
 typedef enum options_state_e {
   OPTIONS,
   ACTIVITY_COLLECTION,
-  HREF,
+  HREF
 } options_state_e;
 
 typedef struct options_state_list_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/property.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/property.c Tue Nov  1 02:30:03 2011
@@ -43,7 +43,7 @@ typedef enum prop_state_e {
   NONE = 0,
   RESPONSE,
   PROP,
-  PROPVAL,
+  PROPVAL
 } prop_state_e;
 
 typedef struct prop_info_t {

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/replay.c Tue Nov  1 02:30:03 2011
@@ -55,7 +55,7 @@ typedef enum replay_state_e {
   ADD_FILE,
   DELETE_ENTRY,
   APPLY_TEXTDELTA,
-  CHANGE_PROP,
+  CHANGE_PROP
 } replay_state_e;
 
 typedef struct replay_info_t replay_info_t;

Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c Tue Nov  1 02:30:03 2011
@@ -68,7 +68,7 @@ typedef enum report_state_e {
     ADD_FILE,
     PROP,
     IGNORE_PROP_NAME,
-    NEED_PROP_NAME,
+    NEED_PROP_NAME
 } report_state_e;
 
 

Modified: subversion/branches/1.7.x/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/main.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/main.c (original)
+++ subversion/branches/1.7.x/subversion/svn/main.c Tue Nov  1 02:30:03 2011
@@ -123,7 +123,7 @@ typedef enum svn_cl__longopt_t {
   opt_diff,
   opt_internal_diff,
   opt_use_git_diff_format,
-  opt_allow_mixed_revisions,
+  opt_allow_mixed_revisions
 } svn_cl__longopt_t;
 
 

Modified: subversion/branches/1.7.x/subversion/svnrdump/svnrdump.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svnrdump/svnrdump.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svnrdump/svnrdump.c (original)
+++ subversion/branches/1.7.x/subversion/svnrdump/svnrdump.c Tue Nov  1 02:30:03 2011
@@ -80,7 +80,7 @@ enum svn_svnrdump__longopt_t
     opt_non_interactive,
     opt_incremental,
     opt_trust_server_cert,
-    opt_version,
+    opt_version
   };
 
 #define SVN_SVNRDUMP__BASE_OPTIONS opt_config_dir, \

Modified: subversion/branches/1.7.x/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svnsync/main.c?rev=1195773&r1=1195772&r2=1195773&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svnsync/main.c (original)
+++ subversion/branches/1.7.x/subversion/svnsync/main.c Tue Nov  1 02:30:03 2011
@@ -67,7 +67,7 @@ enum svnsync__opt {
   svnsync_opt_version,
   svnsync_opt_trust_server_cert,
   svnsync_opt_allow_non_empty,
-  svnsync_opt_steal_lock,
+  svnsync_opt_steal_lock
 };
 
 #define SVNSYNC_OPTS_DEFAULT svnsync_opt_non_interactive, \



Mime
View raw message