Author: julianfoad
Date: Thu Jan 4 10:06:53 2018
New Revision: 1820048
URL: http://svn.apache.org/viewvc?rev=1820048&view=rev
Log:
On the 'shelve-checkpoint' branch: catch up with trunk@1820047.
Modified:
subversion/branches/shelve-checkpoint/ (props changed)
subversion/branches/shelve-checkpoint/subversion/libsvn_wc/wc.h
subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
Propchange: subversion/branches/shelve-checkpoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 4 10:06:53 2018
@@ -98,4 +98,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1801593-1819805
+/subversion/trunk:1801593-1820047
Modified: subversion/branches/shelve-checkpoint/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/libsvn_wc/wc.h?rev=1820048&r1=1820047&r2=1820048&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/libsvn_wc/wc.h (original)
+++ subversion/branches/shelve-checkpoint/subversion/libsvn_wc/wc.h Thu Jan 4
10:06:53 2018
@@ -159,6 +159,7 @@ extern "C" {
*
* == 1.8.x shipped with format 31
* == 1.9.x shipped with format 31
+ * == 1.10.x shipped with format 31
*
* Please document any further format changes here.
*/
Modified: subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c?rev=1820048&r1=1820047&r2=1820048&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/svn/shelve-cmd.c Thu Jan
4 10:06:53 2018
@@ -152,7 +152,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_abspath));
if (result == 0)
SVN_ERR(svn_cmdline_printf(scratch_pool, "\n"));
Modified:
subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/tools/client-side/bash_completion?rev=1820048&r1=1820047&r2=1820048&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/tools/client-side/bash_completion
(original)
+++ subversion/branches/shelve-checkpoint/tools/client-side/bash_completion Thu
Jan 4 10:06:53 2018
@@ -846,6 +846,7 @@ _svn()
# otherwise build possible options for the command
pOpts="--username --password --no-auth-cache --non-interactive \
+ --password-from-stdin \
--trust-server-cert-failures \
--force-interactive"
mOpts="-m --message -F --file --encoding --force-log --with-revprop"
