Author: svn-role
Date: Sun Feb 11 04:00:13 2018
New Revision: 1823808
URL: http://svn.apache.org/viewvc?rev=1823808&view=rev
Log:
Merge r1820044 from trunk:
* r1820044
Make 'svn shelves' diffstat output show WC-relative paths.
Votes:
+1: julianfoad, jamessan, stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/svn/shelve-cmd.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 11 04:00:13 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,1820046-1820047,1820518,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203
+/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,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1823808&r1=1823807&r2=1823808&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Feb 11 04:00:13 2018
@@ -21,11 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1820044
- Make 'svn shelves' diffstat output show WC-relative paths.
- Votes:
- +1: julianfoad, jamessan, stsp
-
* r1823327
Performance: Make the 'info' command fast on old repository revisions.
Justification:
Modified: subversion/branches/1.10.x/subversion/svn/shelve-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/svn/shelve-cmd.c?rev=1823808&r1=1823807&r2=1823808&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/1.10.x/subversion/svn/shelve-cmd.c Sun Feb 11 04:00:13
2018
@@ -121,7 +121,7 @@ shelves_list(const char *local_abspath,
{
#ifndef WIN32
int result = system(apr_psprintf(scratch_pool,
- "diffstat %s 2> /dev/null",
+ "diffstat -p0 %s 2> /dev/null",
info->patch_path));
if (result == 0)
SVN_ERR(svn_cmdline_printf(scratch_pool,
