You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2018/09/23 09:53:55 UTC
svn commit: r1841734 - in /subversion/branches/1.11.x: ./ STATUS
subversion/libsvn_wc/README subversion/libsvn_wc/wc.h
subversion/libsvn_wc/wcroot_anchor.c
Author: stsp
Date: Sun Sep 23 09:53:55 2018
New Revision: 1841734
URL: http://svn.apache.org/viewvc?rev=1841734&view=rev
Log:
Merge r1841059, r1841600, r1841601, r1841602, and r1841606 from trunk.
* r1841059,r1841600,r1841601,r1841602,r1841606
Change the shelf storage dir from ".svn/shelves" to
".svn/experimental/shelves/v2".
Justification:
Stop polluting the ".svn/" namespace with an experimental "shelves" subdir.
Instead use a subdir intended for anything experimental/unstable.
Also fixes SVN-4774 "presence of old 1.10 shelves breaks shelf-list",
giving a cleaner upgrade path for those testing experimental shelving.
Votes:
+1: julianfoad, jamessan
+1: steveking
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/libsvn_wc/README
subversion/branches/1.11.x/subversion/libsvn_wc/wc.h
subversion/branches/1.11.x/subversion/libsvn_wc/wcroot_anchor.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 23 09:53:55 2018
@@ -99,4 +99,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,1841091,1841098,1841136,1841272
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841091,1841098,1841136,1841272,1841600-1841602,1841606
Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841734&r1=1841733&r2=1841734&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sun Sep 23 09:53:55 2018
@@ -54,18 +54,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1841059,r1841600,r1841601,r1841602,r1841606
- Change the shelf storage dir from ".svn/shelves" to
- ".svn/experimental/shelves/v2".
- Justification:
- Stop polluting the ".svn/" namespace with an experimental "shelves" subdir.
- Instead use a subdir intended for anything experimental/unstable.
- Also fixes SVN-4774 "presence of old 1.10 shelves breaks shelf-list",
- giving a cleaner upgrade path for those testing experimental shelving.
- Votes:
- +1: julianfoad, jamessan
- +1: steveking
-
* r1841180, r1841524, r1841525
Merge the 'java10-compat' branch to trunk
Justification:
Modified: subversion/branches/1.11.x/subversion/libsvn_wc/README
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_wc/README?rev=1841734&r1=1841733&r2=1841734&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_wc/README (original)
+++ subversion/branches/1.11.x/subversion/libsvn_wc/README Sun Sep 23 09:53:55 2018
@@ -94,6 +94,9 @@ copies.
.svn/wc.db /* SQLite database containing node metadata. */
pristine/ /* Sharded directory containing base files. */
tmp/ /* Local tmp area. */
+ experimental/ /* Data for experimental features. */
+ entries /* Stub file. */
+ format /* Stub file. */
`wc.db':
A self-contained SQLite database containing all the metadata Subversion
@@ -109,6 +112,13 @@ copies.
Pristines are used for sending diffs back to the server, etc.
+`experimental':
+ Experimental (unstable) features store their data here.
+
+`entries', `format':
+ These stub files exist only to enable a pre-1.7 client to yield a clearer
+ error message.
+
How the client applies an update delta
--------------------------------------
Modified: subversion/branches/1.11.x/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_wc/wc.h?rev=1841734&r1=1841733&r2=1841734&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/1.11.x/subversion/libsvn_wc/wc.h Sun Sep 23 09:53:55 2018
@@ -289,6 +289,7 @@ struct svn_wc_traversal_info_t
#define SVN_WC__ADM_TMP "tmp"
#define SVN_WC__ADM_PRISTINE "pristine"
#define SVN_WC__ADM_NONEXISTENT_PATH "nonexistent-path"
+#define SVN_WC__ADM_EXPERIMENTAL "experimental"
/* The basename of the ".prej" file, if a directory ever has property
conflicts. This .prej file will appear *within* the conflicted
Modified: subversion/branches/1.11.x/subversion/libsvn_wc/wcroot_anchor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_wc/wcroot_anchor.c?rev=1841734&r1=1841733&r2=1841734&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_wc/wcroot_anchor.c (original)
+++ subversion/branches/1.11.x/subversion/libsvn_wc/wcroot_anchor.c Sun Sep 23 09:53:55 2018
@@ -193,7 +193,10 @@ svn_wc__get_shelves_dir(char **dir,
SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, wc_ctx, local_abspath,
scratch_pool, scratch_pool));
- *dir = svn_dirent_join(wcroot_abspath, ".svn/shelves", result_pool);
+ *dir = svn_dirent_join(wcroot_abspath,
+ SVN_WC_ADM_DIR_NAME "/" SVN_WC__ADM_EXPERIMENTAL "/"
+ "shelves/v2",
+ result_pool);
/* Ensure the directory exists. (Other versions of svn don't create it.) */
SVN_ERR(svn_io_make_dir_recursively(*dir, scratch_pool));