svn commit: r904072 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Thu Jan 28 13:14:32 2010
New Revision: 904072

URL: http://svn.apache.org/viewvc?rev=904072&view=rev
Log:
Add a regression test for a reverse merge, move and update second working
copy scenario. A bug caused the second working copy to get both the move
destination and the move source files added. This bug exists in 1.6.9, but
on trunk the commit stage of the test fails so the test is already marked
XFail.

See the email thread <http://svn.haxx.se/dev/archive-2009-12/0347.shtml>.

* subversion/tests/cmdline/copy_tests.py
  (reverse_merge_move): Also check the result of updating a second WC.

Found by: alan.spencer
Suggested by: julianfoad
Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

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=904072&r1=904071&r2=904072&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Thu Jan 28 13:14:32 2010
@@ -4274,9 +4274,13 @@
 
   wc_dir = sbox.wc_dir
   a_dir = os.path.join(wc_dir, 'A')
-  a_repo_url = sbox.repo_url+ '/A'
+  a_repo_url = sbox.repo_url + '/A'
   sbox.build()
 
+  # Create another working copy path and checkout.
+  wc2_dir = sbox.add_wc_path('2')
+  rav_svn(None, None, [], 'co', sbox.repo_url, wc2_dir)
+
   # Update working directory and ensure that we are at revision 1.
   rav_svn(None, ["At revision 1.\n"], [], 'up', wc_dir)
 
@@ -4304,6 +4308,16 @@
           'ci', '-m',
           'Revert svn merge. svn mv %s %s.' % (first_path, second_path), a_dir)
 
+  # Update second working copy. There was a bug (at least on the 1.6.x
+  # branch) in which this update received both "first" and "second".
+  expected_output = svntest.wc.State(wc2_dir, {
+      'A/New'         : Item(status='A '),
+      'A/New/second'  : Item(status='A '),
+      })
+  svntest.actions.run_and_verify_update(wc2_dir,
+                                        expected_output,
+                                        None,
+                                        None)
 
 ########################################################################
 # Run the tests