subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1438151 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Date Thu, 24 Jan 2013 20:00:45 GMT
Author: julianfoad
Date: Thu Jan 24 20:00:45 2013
New Revision: 1438151

URL: http://svn.apache.org/viewvc?rev=1438151&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (merge_automatic_conflict_resolution): Remove an obsolete comment.

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=1438151&r1=1438150&r2=1438151&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Jan 24 20:00:45 2013
@@ -15145,8 +15145,6 @@ def record_only_merge(sbox):
 #----------------------------------------------------------------------
 # Test for issue #3514 'svn merge --accept [ base | theirs-full ]
 # doesn't work'
-#
-# This test is marked as XFail until issue #3514 is fixed.
 @Issue(3514)
 def merge_automatic_conflict_resolution(sbox):
   "automatic conflict resolutions work with merge"



Mime
View raw message