Author: julianfoad
Date: Tue Jan 23 16:16:24 2018
New Revision: 1822025
URL: http://svn.apache.org/viewvc?rev=1822025&view=rev
Log:
Shelving: add a test for shelving mergeinfo, XFail, issue #3747.
* subversion/tests/cmdline/shelf_tests.py
(shelve_mergeinfo): New test.
(test_list): Run it.
Modified:
subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1822025&r1=1822024&r2=1822025&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Tue Jan 23
16:16:24 2018
@@ -215,6 +215,19 @@ def checkpoint_basic(sbox):
save_revert_restore(sbox, modifier1, modifier2)
+#----------------------------------------------------------------------
+
+@XFail()
+@Issue(3747)
+def shelve_mergeinfo(sbox):
+ "shelve mergeinfo"
+
+ def modifier(sbox):
+ sbox.simple_propset('svn:mergeinfo', '/trunk/A:1-3,10', 'A')
+ sbox.simple_propset('svn:mergeinfo', '/trunk/A/mu:1-3,10', 'A/mu')
+
+ shelve_unshelve(sbox, modifier)
+
########################################################################
# Run the tests
@@ -227,6 +240,7 @@ test_list = [ None,
shelve_deletes,
shelve_from_inner_path,
checkpoint_basic,
+ shelve_mergeinfo,
]
if __name__ == '__main__':
