subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r918582 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Date Wed, 03 Mar 2010 17:15:22 GMT
Author: rhuijben
Date: Wed Mar  3 17:15:22 2010
New Revision: 918582

URL: http://svn.apache.org/viewvc?rev=918582&view=rev
Log:
Following up on r918542, commit the fixed merge test.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): Don't assume that commit will show an Adding
    line for a file that is added via its parent.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=918582&r1=918581&r2=918582&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Mar  3 17:15:22 2010
@@ -3009,9 +3009,7 @@
   expected_output = svntest.wc.State(wc_dir, {
     'A/C'                    : Item(verb='Sending'),
     'A/C/foo'                : Item(verb='Replacing'),
-    'A/C/foo/new file 2'     : Item(verb='Adding'),
     'A/C/foo/bar'            : Item(verb='Adding'),
-
     })
   
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)



Mime
View raw message