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/08/23 15:56:37 UTC
svn commit: r1160696 - in /subversion/branches/1.7.x: ./ STATUS
subversion/svndumpfilter/main.c
subversion/tests/cmdline/svndumpfilter_tests.py
Author: hwright
Date: Tue Aug 23 13:56:37 2011
New Revision: 1160696
URL: http://svn.apache.org/viewvc?rev=1160696&view=rev
Log:
Merge r1159760, r1159772 from trunk:
* r1159760, r1159772
Oops! Swap some output variations that were keyed on
reversed logic. (--patterns mode was talking about "Path
prefixes", while the regular path prefix mode was talking about
"Path prefix patterns")
Justification:
Output mode should match execution mode, dontcha think?
Notes:
This is pretty close to being an "obvious fix", but let's get more eyes
just in case I missed something.
Votes:
+1: cmpilato, danielsh, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svndumpfilter/main.c
subversion/branches/1.7.x/subversion/tests/cmdline/svndumpfilter_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 23 13:56:37 2011
@@ -59,4 +59,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,1148083,1148094,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,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,115
8303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159230,1159275,1159686
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148083,1148094,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,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,115
8303,1158309,1158407,1158419,1158421,1158436,1158455,1158616,1158634,1158854,1158893,1159093,1159098,1159101,1159230,1159275,1159686,1159760,1159772
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1160696&r1=1160695&r2=1160696&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Aug 23 13:56:37 2011
@@ -145,16 +145,3 @@ Approved changes:
Votes:
+1: rhuijben, cmpilato
+1 (once tests pass): danielsh
-
- * r1159760, r1159772
- Oops! Swap some output variations that were keyed on
- reversed logic. (--patterns mode was talking about "Path
- prefixes", while the regular path prefix mode was talking about
- "Path prefix patterns")
- Justification:
- Output mode should match execution mode, dontcha think?
- Notes:
- This is pretty close to being an "obvious fix", but let's get more eyes
- just in case I missed something.
- Votes:
- +1: cmpilato, danielsh, rhuijben
\ No newline at end of file
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=1160696&r1=1160695&r2=1160696&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svndumpfilter/main.c (original)
+++ subversion/branches/1.7.x/subversion/svndumpfilter/main.c Tue Aug 23 13:56:37 2011
@@ -1106,12 +1106,12 @@ do_filter(apr_getopt_t *os,
do_exclude
? opt_state->drop_empty_revs
? _("Excluding (and dropping empty "
- "revisions for) prefixes:\n")
- : _("Excluding prefixes:\n")
+ "revisions for) prefix patterns:\n")
+ : _("Excluding prefix patterns:\n")
: opt_state->drop_empty_revs
? _("Including (and dropping empty "
- "revisions for) prefixes:\n")
- : _("Including prefixes:\n")));
+ "revisions for) prefix patterns:\n")
+ : _("Including prefix patterns:\n")));
}
else
{
@@ -1119,12 +1119,12 @@ do_filter(apr_getopt_t *os,
do_exclude
? opt_state->drop_empty_revs
? _("Excluding (and dropping empty "
- "revisions for) prefix patterns:\n")
- : _("Excluding prefix patterns:\n")
+ "revisions for) prefixes:\n")
+ : _("Excluding prefixes:\n")
: opt_state->drop_empty_revs
? _("Including (and dropping empty "
- "revisions for) prefix patterns:\n")
- : _("Including prefix patterns:\n")));
+ "revisions for) prefixes:\n")
+ : _("Including prefixes:\n")));
}
for (i = 0; i < opt_state->prefixes->nelts; i++)
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1160696&r1=1160695&r2=1160696&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/svndumpfilter_tests.py Tue Aug 23 13:56:37 2011
@@ -439,7 +439,7 @@ def filter_mergeinfo_revs_outside_of_dum
# Check that all the blather above really happens. First does
# svndumpfilter report what we expect to stderr?
expected_err = [
- "Excluding (and dropping empty revisions for) prefix patterns:\n",
+ "Excluding (and dropping empty revisions for) prefixes:\n",
" '/branches/B2'\n",
"\n",
"Revision 6 committed as 6.\n",