Author: hwright
Date: Mon Aug 8 11:28:55 2011
New Revision: 1154922
URL: http://svn.apache.org/viewvc?rev=1154922&view=rev
Log:
Merge r1154121 from trunk:
* r1154121
Improve a message.
Justification:
Translators won't have to maintain separate translations of help message
for 'svn mergeinfo' on trunk and 1.7.x branch.
Votes:
+1: arfrever, rhuijben, julianfoad
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svn/main.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 8 11:28:55 2011
@@ -55,4 +55,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,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,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,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023,1154461
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,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,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023,1154121,1154461
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154922&r1=1154921&r2=1154922&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Aug 8 11:28:55 2011
@@ -199,11 +199,3 @@ Approved changes:
Allow proper translation of some messages.
Votes:
+1: arfrever, rhuijben, julianfoad
-
- * r1154121
- Improve a message.
- Justification:
- Translators won't have to maintain separate translations of help message
- for 'svn mergeinfo' on trunk and 1.7.x branch.
- Votes:
- +1: arfrever, rhuijben, julianfoad
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=1154922&r1=1154921&r2=1154922&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/main.c (original)
+++ subversion/branches/1.7.x/subversion/svn/main.c Mon Aug 8 11:28:55 2011
@@ -932,7 +932,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
" Display information related to merges (or potential merges) between\n"
" SOURCE and TARGET (default: '.'). Display the type of information\n"
" specified by the --show-revs option. If --show-revs isn't passed,\n"
- " it defaults to --show-revs='merged'.\n"),
+ " it defaults to --show-revs='merged'.\n"
+ "\n"
+ " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"),
{'r', 'R', opt_depth, opt_show_revs} },
{ "mkdir", svn_cl__mkdir, {0}, N_
