Author: hwright
Date: Sat Jul 30 01:00:50 2011
New Revision: 1152409
URL: http://svn.apache.org/viewvc?rev=1152409&view=rev
Log:
Merge r1151911 from trunk:
* r1151911
Fix description of svndumpfilter's --targets option.
Votes:
+1: cmpilato, hwright, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svndumpfilter/main.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 30 01:00:50 2011
@@ -54,4 +54,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,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150812,1151036,1152129
+/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,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150812,1151036,1151911,1152129
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1152409&r1=1152408&r2=1152409&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jul 30 01:00:50 2011
@@ -207,8 +207,3 @@ Approved changes:
this revision depends for a clean merge).
Votes:
+1: rhuijben, danielsh, cmpilato
-
- * r1151911
- Fix description of svndumpfilter's --targets option.
- Votes:
- +1: cmpilato, hwright, rhuijben
Modified: subversion/branches/1.7.x/subversion/svndumpfilter/main.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svndumpfilter/main.c?rev=1152409&r1=1152408&r2=1152409&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/1.7.x/subversion/svndumpfilter/main.c Sat Jul 30
01:00:50 2011
@@ -938,7 +938,8 @@ static const apr_getopt_option_t options
{"preserve-revprops", svndumpfilter__preserve_revprops, 0,
N_("Don't filter revision properties.") },
{"targets", svndumpfilter__targets, 1,
- N_("Pass contents of file ARG as additional args")},
+ N_("Read additional prefixes, one per line, from\n"
+ " file ARG.")},
{NULL}
};
