Author: julianfoad
Date: Tue Feb 6 15:56:48 2018
New Revision: 1823354
URL: http://svn.apache.org/viewvc?rev=1823354&view=rev
Log:
Shelving: fix merginfo support in shelving v1.
Issue #SVN-3747.
* subversion/libsvn_client/shelve.c
(shelf_write_patch): Use no-pretty-print format for mergeinfo.
Modified:
subversion/trunk/subversion/libsvn_client/shelve.c
Modified: subversion/trunk/subversion/libsvn_client/shelve.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelve.c?rev=1823354&r1=1823353&r2=1823354&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/shelve.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelve.c Tue Feb 6 15:56:48 2018
@@ -194,7 +194,7 @@ shelf_write_patch(const char *name,
_("'%s' is not a local path"), path);
SVN_ERR(svn_dirent_get_absolute(&path, path, scratch_pool));
- SVN_ERR(svn_client_diff_peg6(
+ SVN_ERR(svn_client_diff_peg7(
NULL /*options*/,
path,
&peg_revision,
@@ -210,6 +210,7 @@ shelf_write_patch(const char *name,
FALSE /*ignore_properties*/,
FALSE /*properties_only*/,
FALSE /*use_git_diff_format*/,
+ TRUE /*pretty_print_mergeinfo*/,
SVN_APR_LOCALE_CHARSET,
outstream,
errstream,
