You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2018/06/14 17:30:24 UTC
svn commit: r1833533 -
/subversion/trunk/subversion/tests/cmdline/shelf_tests.py
Author: julianfoad
Date: Thu Jun 14 17:30:24 2018
New Revision: 1833533
URL: http://svn.apache.org/viewvc?rev=1833533&view=rev
Log:
* subversion/tests/cmdline/shelf_tests.py
(unshelve_with_merge): Add a doc-string.
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=1833533&r1=1833532&r2=1833533&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Thu Jun 14 17:30:24 2018
@@ -662,6 +662,10 @@ def refuse_to_shelve_conflict(sbox):
#----------------------------------------------------------------------
def unshelve_with_merge(sbox, setup, modifier1, modifier2, tweak_expected_state):
+ """Run a test scenario in which 'unshelve' needs to merge some shelved
+ changes made by modifier1() with some committed changes made by
+ modifier2(). tweak_expected_state() must produce the expected WC state.
+ """
sbox.build()
was_cwd = os.getcwd()
os.chdir(sbox.wc_dir)