* subversion/tests/cmdline/shelve_tests.py
(shelve_prop_changes): New test.
(test_list): Run it.
@@ -81,6 +81,39 @@ def basic_shelve(sbox):
#----------------------------------------------------------------------
+def shelve_prop_changes(sbox):
+ "shelve prop changes"
+
+ sbox.build()
+ was_cwd = os.getcwd()
+ os.chdir(sbox.wc_dir)
+ sbox.wc_dir = ''
+ wc_dir = ''
+
+ # Make some changes to the working copy
+ sbox.simple_propset('p', 'v', 'A')
+ sbox.simple_propset('p', 'v', 'A/mu')
+
+ modified_output = svntest.actions.get_virginal_state(wc_dir, 1)
+ modified_output.tweak('A', status=' M')
+ modified_output.tweak('A/mu', status=' M')
+ svntest.actions.run_and_verify_status(wc_dir, modified_output)
+
+ # Shelve; check there are no longer any modifications
+ svntest.actions.run_and_verify_svn(None, [],
+ 'shelve', 'foo')
+ virginal_output = svntest.actions.get_virginal_state(wc_dir, 1)
+ svntest.actions.run_and_verify_status(wc_dir, virginal_output)
+
+ # Unshelve; check the original modifications are here again
+ svntest.actions.run_and_verify_svn(None, [],
+ 'unshelve', 'foo')
+ svntest.actions.run_and_verify_status(wc_dir, modified_output)
+
+ os.chdir(was_cwd)
+
+#----------------------------------------------------------------------
+
########################################################################
# Run the tests
@@ -88,6 +121,7 @@ def basic_shelve(sbox):
# list all tests here, starting with None:
test_list = [ None,
basic_shelve,
+ shelve_prop_changes,
]
if __name__ == '__main__':
