Author: svn-role
Date: Sun Feb 25 04:00:05 2018
New Revision: 1825285
URL: http://svn.apache.org/viewvc?rev=1825285&view=rev
Log:
Merge r1825045 from trunk:
* r1825045
Shelving: correct the help text for shelving v1 storage location.
Justification:
The help incorrectly specified the names of stored patch files.
Votes:
+1: julianfoad, brane, jamessan
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/svn/svn.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 25 04:00:05 2018
@@ -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:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820627,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822587,1822591,1822996,1823202-1823203,1823211,1823327,1823791,1823966,1823989,1824033,1825045
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1825285&r1=1825284&r2=1825285&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Feb 25 04:00:05 2018
@@ -21,13 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1825045
- Shelving: correct the help text for shelving v1 storage location.
- Justification:
- The help incorrectly specified the names of stored patch files.
- Votes:
- +1: julianfoad, brane, jamessan
-
* r1825215
Expose the functionality of the new-in-1.10 svn_repos_load_fs6 in JavaHL.
Justification:
Modified: subversion/branches/1.10.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/svn.c?rev=1825285&r1=1825284&r2=1825285&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.10.x/subversion/svn/svn.c Sun Feb 25 04:00:05 2018
@@ -1715,7 +1715,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" To bring back a shelved change, use 'svn unshelve NAME'.\n"
"\n"
- " A shelved change is stored as a patch file, .svn/shelves/NAME.patch\n"
+ " Shelved changes are stored in <WC>/.svn/shelves/\n"
"\n"
" The shelving feature is EXPERIMENTAL. This command is likely to
change\n"
" in the next release, and there is no promise of backward
compatibility.\n"
