You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/02/15 02:52:24 UTC
svn commit: r1244303 -
/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Author: danielsh
Date: Wed Feb 15 01:52:24 2012
New Revision: 1244303
URL: http://svn.apache.org/viewvc?rev=1244303&view=rev
Log:
Add a regression test for issue #4052.
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_symlink_deletion): New test, XFail, POSIX only.
(run_test): Run it.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1244303&r1=1244302&r2=1244303&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Feb 15 01:52:24 2012
@@ -2542,6 +2542,47 @@ def reintegrate_replaced_source(sbox):
[], None, None, None, None, True, True,
'--reintegrate', A_path)
+#----------------------------------------------------------------------
+@SkipUnless(svntest.main.is_posix_os)
+@XFail()
+@Issue(4052)
+def reintegrate_symlink_deletion(sbox):
+ "reintegrate symlink deletion"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ ## path vars
+ A_path = sbox.ospath('A')
+ A_omicron_path = sbox.ospath('A/omicron')
+ mu_path = sbox.ospath('A/mu')
+ A_COPY_path = sbox.ospath('A_COPY')
+ A_COPY_omicron_path = sbox.ospath('A_COPY/omicron')
+ A_url = sbox.repo_url + "/A"
+ A_COPY_url = sbox.repo_url + "/A_COPY"
+
+ ## add symlink
+ os.symlink(mu_path, A_omicron_path)
+ sbox.simple_add('A/omicron')
+ sbox.simple_commit(message='add symlink')
+
+ ## branch
+ svntest.main.run_svn(None, 'cp', A_url, A_COPY_url, '-m', 'branch')
+ sbox.simple_update()
+
+ ## branch rm
+ sbox.simple_rm('A_COPY/omicron')
+ sbox.simple_commit(message='remove symlink on branch')
+
+ ## Note: running update at this point avoids the bug.
+
+ ## reintegrate
+ # ### TODO: verify something here
+ svntest.main.run_svn(None, 'merge', '--reintegrate',
+ A_COPY_url, A_path)
+
+
+
########################################################################
# Run the tests
@@ -2565,6 +2606,7 @@ test_list = [ None,
reintegrate_creates_bogus_mergeinfo,
no_source_subtree_mergeinfo,
reintegrate_replaced_source,
+ reintegrate_symlink_deletion,
]
if __name__ == '__main__':