Author: julianfoad
Date: Wed Jan 24 20:58:08 2018
New Revision: 1822164
URL: http://svn.apache.org/viewvc?rev=1822164&view=rev
Log:
Shelving: support svn:mergeinfo changes.
* subversion/libsvn_client/shelf.c
(write_patch): Use the regular property diff format for svn:mergeinfo.
* subversion/svn/svn.c
(svn_cl__cmd_table): Remove 'mergeinfo' from the list of exclusions in
the 'shelve' help text.
* subversion/tests/cmdline/shelf_tests.py
(shelve_mergeinfo): Remove 'XFail', as this test now passes.
Modified:
subversion/trunk/subversion/libsvn_client/shelf.c
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1822164&r1=1822163&r2=1822164&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Wed Jan 24 20:58:08 2018
@@ -365,7 +365,7 @@ write_patch(const char *patch_abspath,
_("'%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,
@@ -381,6 +381,7 @@ write_patch(const char *patch_abspath,
FALSE /*ignore_properties*/,
FALSE /*properties_only*/,
FALSE /*use_git_diff_format*/,
+ FALSE /*pretty_print_mergeinfo*/,
SVN_APR_LOCALE_CHARSET,
outstream,
errstream,
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1822164&r1=1822163&r2=1822164&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Jan 24 20:58:08 2018
@@ -1775,7 +1775,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" The kinds of change you can shelve are those supported by 'svn diff'\n"
" and 'svn patch'. The following are currently NOT supported:\n"
- " mergeinfo changes, copies, moves, mkdir, rmdir,\n"
+ " copies, moves, mkdir, rmdir,\n"
" 'binary' content, uncommittable states\n"
"\n"
" To bring back shelved changes, use 'svn unshelve NAME'.\n"
Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1822164&r1=1822163&r2=1822164&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Wed Jan 24
20:58:08 2018
@@ -217,7 +217,6 @@ def checkpoint_basic(sbox):
#----------------------------------------------------------------------
-@XFail()
@Issue(3747)
def shelve_mergeinfo(sbox):
"shelve mergeinfo"
