Author: rhuijben
Date: Mon Jun 6 19:22:44 2011
New Revision: 1132731
URL: http://svn.apache.org/viewvc?rev=1132731&view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(copying_conflicts): Remove old file before renaming a new file to this
name to fix this test on Windows.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1132731&r1=1132730&r2=1132731&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Jun 6 19:22:44
2011
@@ -5306,8 +5306,9 @@ def copying_conflicts(sbox):
# Resolve one text conflict via marker file deletion.
os.remove(wc('A/B/E/beta.merge-left.r3'))
- os.rename(wc('A/B/E/beta.merge-right.r4'), wc('A/B/E/beta'))
os.remove(wc('A/B/E/beta.working'))
+ os.remove(wc('A/B/E/beta'))
+ os.rename(wc('A/B/E/beta.merge-right.r4'), wc('A/B/E/beta'))
# Prepare for local copies and moves.
sbox.simple_mkdir('copy-dest')
