Author: julianfoad
Date: Mon Sep 17 10:27:13 2018
New Revision: 1841059
URL: http://svn.apache.org/viewvc?rev=1841059&view=rev
Log:
Shelving: fix SVN-4774 "presence of old 1.10 shelves breaks shelf-list".
Change the shelves storage dir to be (1) different from the one used by
shelving-v1 in svn 1.10; (2) under an "x" prefix to designate "experimental";
(3) using a shelving format version number so we can cleanly create
further experimental versions.
* subversion/libbsvn_wc/wcroot_anchor.c
(svn_wc__get_shelves_dir): Use ".svn/x/shelves/v2" instead of ".svn/shelves".
Modified:
subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
Modified: subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c?rev=1841059&r1=1841058&r2=1841059&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c Mon Sep 17 10:27:13
2018
@@ -193,7 +193,7 @@ 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/x/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));
