subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1227256 - /subversion/trunk/subversion/tests/cmdline/commit_tests.py
Date Wed, 04 Jan 2012 18:32:45 GMT
Author: stsp
Date: Wed Jan  4 18:32:45 2012
New Revision: 1227256

URL: http://svn.apache.org/viewvc?rev=1227256&view=rev
Log:
* subversion/tests/cmdline/commit_tests.py
  (commit_add_subadd): Revert r1201420 since it appears to make this test
   fail for the wrong reason. It hits "path not found" during 'svn copy',
   rather than the expected "'foo' is not under version control and is not
   part of the commit, yet its child 'bar' is part of the commit" during
   'svn commit'.

Modified:
    subversion/trunk/subversion/tests/cmdline/commit_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1227256&r1=1227255&r2=1227256&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Wed Jan  4 18:32:45 2012
@@ -2839,25 +2839,21 @@ def commit_add_subadd(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  A_path = os.path.join(wc_dir, 'A')
-  A2_path = os.path.join(wc_dir, 'A2')
-
   targets_file = sbox.ospath('targets') # ### better tempdir?
   targets_file = os.path.abspath(targets_file)
 
   # prepare targets file
-  targets = "A2/D A2/D/H A2/D/H/chi A2/D/H/omega A2/D/H/psi".split()
+  targets = "A/D A/D/H A/D/H/chi A/D/H/omega A/D/H/psi".split()
   open(targets_file, 'w').write("\n".join(targets))
 
-  # r2: add some stuff, with specific invocation
-  import shutil
-  shutil.copytree(A_path, A2_path)
-
-  # hack to copy A to A2, without creating .svn dirs when running against 1.6
-  svntest.main.run_svn(None, 'cp', A_path, A2_path)
-  svntest.main.run_svn(None, 'revert', '-R', A2_path)
+  # r2: rm A/D
+  sbox.simple_rm('A/D')
+  sbox.simple_commit(message='rm')
 
+  # r3: revert r2, with specific invocation
   os.chdir(wc_dir)
+  svntest.main.run_svn(None, 'up')
+  svntest.main.run_svn(None, 'merge', '-c', '-2', './')
   svntest.main.run_svn(None, 'commit', '--targets', targets_file, '-mm')
 
 



Mime
View raw message