svn commit: r1126951 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

[st...@apache.org]

Author: stsp
Date: Tue May 24 09:29:13 2011
New Revision: 1126951

URL: http://svn.apache.org/viewvc?rev=1126951&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Test adding an obstruction of the actual-only
    node.

Suggested by: philip

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

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1126951&r1=1126950&r2=1126951&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Tue May 24 09:29:13 2011
@@ -1138,6 +1138,20 @@ def actual_only_node_behaviour(sbox):
   run_and_verify_svn(None, expected_stdout, expected_stderr,
                      "add", foo_path)
 
+  # add (with an existing obstruction of foo)
+  ### this does not error out -- needs review
+  svntest.main.file_write(foo_path, "This is an obstruction of foo.\n")
+  expected_stdout = "A.*foo"
+  expected_stderr = []
+  run_and_verify_svn(None, expected_stdout, expected_stderr,
+                     "add", foo_path)
+  ### for now, ignore the fact that add succeeds, revert the entire
+  ### working copy, and repeat the merge so we can test more commands
+  svntest.main.run_svn(None, "revert", "-R", wc_dir)
+  os.remove(foo_path) # remove obstruction
+  svntest.main.run_svn(None, "merge", '-c', '4', A_copy_url,
+                       os.path.join(wc_dir, 'A'))
+
   # blame (praise, annotate, ann)
   expected_stdout = None
   expected_stderr = ".*foo.*not found.*"