You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2017/10/27 10:20:37 UTC

svn commit: r1813503 - in /subversion/branches/shelve: ff subversion/libsvn_client/shelve.c

Author: julianfoad
Date: Fri Oct 27 10:20:37 2017
New Revision: 1813503

URL: http://svn.apache.org/viewvc?rev=1813503&view=rev
Log:
On the 'shelve' branch: Fix 'svn shelve --list' and 'svn_client_shelves_list'
to work in any directory; it only worked in the WC root.

* subversion/libssvn_client/shelve.c
  (svn_client_shelves_list): Use the passed-in path only to find the WC
    root and metadata, don't assume it is the WC root.

Added:
    subversion/branches/shelve/ff
Modified:
    subversion/branches/shelve/subversion/libsvn_client/shelve.c

Added: subversion/branches/shelve/ff
URL: http://svn.apache.org/viewvc/subversion/branches/shelve/ff?rev=1813503&view=auto
==============================================================================
--- subversion/branches/shelve/ff (added)
+++ subversion/branches/shelve/ff Fri Oct 27 10:20:37 2017
@@ -0,0 +1,2 @@
+On the 'shelve' branch:
+

Modified: subversion/branches/shelve/subversion/libsvn_client/shelve.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve/subversion/libsvn_client/shelve.c?rev=1813503&r1=1813502&r2=1813503&view=diff
==============================================================================
--- subversion/branches/shelve/subversion/libsvn_client/shelve.c (original)
+++ subversion/branches/shelve/subversion/libsvn_client/shelve.c Fri Oct 27 10:20:37 2017
@@ -396,9 +396,7 @@ svn_client_shelves_list(apr_hash_t **she
           info->dirent = apr_hash_this_val(hi);
           info->mtime = info->dirent->mtime;
           info->patch_path
-            = svn_dirent_join_many(result_pool,
-                                   local_abspath, ".svn", "shelves", filename,
-                                   SVN_VA_NULL);
+            = svn_dirent_join(shelves_dir, filename, result_pool);
           SVN_ERR(read_logmsg_from_patch(&info->message, info->patch_path,
                                          result_pool, scratch_pool));