subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1841862 - in /subversion/branches/1.11.x: ./ STATUS subversion/svn/svn.c
Date Mon, 24 Sep 2018 14:42:21 GMT
Author: julianfoad
Date: Mon Sep 24 14:42:21 2018
New Revision: 1841862

URL: http://svn.apache.org/viewvc?rev=1841862&view=rev
Log:
Merge r1841822 from trunk:

 * r1841822
   Shelving: update the command-line help about the storage directory and say
   how to recover a 1.10 shelf.
   Justification:
     Support transitioning from 1.10 to 1.11 experimental shelving.
   Votes:
     +1: julianfoad, brane, jcorvel

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 Mon Sep 24 14:42:21 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:1840990-1840991,1840995,1840997,1841059,1841091,1841098,1841136,1841180,1841272,1841524-1841525,1841600-1841602,1841606,1841731,1841736,1841743
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841091,1841098,1841136,1841180,1841272,1841524-1841525,1841600-1841602,1841606,1841731,1841736,1841743,1841822

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841862&r1=1841861&r2=1841862&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Mon Sep 24 14:42:21 2018
@@ -37,14 +37,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1841822
-   Shelving: update the command-line help about the storage directory and say
-   how to recover a 1.10 shelf.
-   Justification:
-     Support transitioning from 1.10 to 1.11 experimental shelving.
-   Votes:
-     +1: julianfoad, brane, jcorvel
-
  * r1841079,r1841481,r1841567
    Move all experimental APIs to the private namespace.
    Justification:

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=1841862&r1=1841861&r2=1841862&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.11.x/subversion/svn/svn.c Mon Sep 24 14:42:21 2018
@@ -2057,7 +2057,11 @@ const svn_opt_subcommand_desc3_t svn_cl_
      "\n"), N_(
      "  To bring back shelved changes, use 'svn unshelve SHELF'.\n"
      "\n"), N_(
-     "  Shelves are stored in <WC>/.svn/shelves/\n"
+     "  Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
+     "  (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
+     "  patch files. To recover a shelf created by 1.10, either use a 1.10\n"
+     "  client to find and unshelve it, or find the patch file and use any\n"
+     "  1.10 or later 'svn patch' to apply it.)\n"
      "\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"



Mime
View raw message