Author: svn-role Date: Wed Mar 6 04:00:16 2019 New Revision: 1854885 URL: http://svn.apache.org/viewvc?rev=1854885&view=rev Log: Merge r1847377 from trunk:
* r1847377 Reduce the scope of the Windows-specific help text for 'svn list'. Justification: Should make backporting translations easier with a more more similar generated .po file. Votes: +1: brane, stefan2, stsp Modified: subversion/branches/1.11.x/ (props changed) subversion/branches/1.11.x/STATUS subversion/branches/1.11.x/subversion/svn/svn.c Propchange: subversion/branches/1.11.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 6 04:00:16 2019 @@ -100,4 +100,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596,1850348,1850621 +/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847377,1847572,1847596,1850348,1850621 Modified: subversion/branches/1.11.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1854885&r1=1854884&r2=1854885&view=diff ============================================================================== --- subversion/branches/1.11.x/STATUS (original) +++ subversion/branches/1.11.x/STATUS Wed Mar 6 04:00:16 2019 @@ -93,14 +93,6 @@ Veto-blocked changes: Approved changes: ================= - * r1847377 - Reduce the scope of the Windows-specific help text for 'svn list'. - Justification: - Should make backporting translations easier with a more more similar - generated .po file. - Votes: - +1: brane, stefan2, stsp - * r1847598, r1847697, r1847922, r1847924, r1847946 Fix SVN-4793: authz rights from inverted access selectors were not accounted for at the global level, causing wrong authz check results. Modified: subversion/branches/1.11.x/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/svn/svn.c?rev=1854885&r1=1854884&r2=1854885&view=diff ============================================================================== --- subversion/branches/1.11.x/subversion/svn/svn.c (original) +++ subversion/branches/1.11.x/subversion/svn/svn.c Wed Mar 6 04:00:16 2019 @@ -860,7 +860,6 @@ const svn_opt_subcommand_desc3_t svn_cl_ }, { "list", svn_cl__list, {"ls"}, -#if defined(WIN32) {N_( "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" @@ -872,37 +871,22 @@ const svn_opt_subcommand_desc3_t svn_cl_ "\n"), N_( " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" - "\n"), N_( + "\n"), +#if defined(WIN32) + N_( " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - contains a sub-string matching at least one of these patterns\n" " (Windows only).\n" - "\n"), N_( - " With --verbose, the following fields will be shown for each item:\n" - "\n"), N_( - " Revision number of the last commit\n" - " Author of the last commit\n" - " If locked, the letter 'O'. (Use 'svn info URL' to see details)\n" - " Size (in bytes)\n" - " Date and time of the last commit\n" - )}, + "\n"), #else - {N_( - "List directory entries in the repository.\n" - "usage: list [TARGET[@REV]...]\n" - "\n"), N_( - " List each TARGET file and the contents of each TARGET directory as\n" - " they exist in the repository. If TARGET is a working copy path, the\n" - " corresponding repository URL will be used. If specified, REV determines\n" - " in which revision the target is first looked up.\n" - "\n"), N_( - " The default TARGET is '.', meaning the repository URL of the current\n" - " working directory.\n" - "\n"), N_( + N_( " Multiple --search patterns may be specified and the output will be\n" " reduced to those paths whose last segment - i.e. the file or directory\n" " name - matches at least one of these patterns.\n" - "\n"), N_( + "\n"), +#endif + N_( " With --verbose, the following fields will be shown for each item:\n" "\n"), N_( " Revision number of the last commit\n" @@ -911,7 +895,6 @@ const svn_opt_subcommand_desc3_t svn_cl_ " Size (in bytes)\n" " Date and time of the last commit\n" )}, -#endif {'r', 'v', 'R', opt_depth, opt_incremental, opt_xml, opt_include_externals, opt_search}, },