You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/02/15 15:42:00 UTC
svn commit: r1446609 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: julianfoad
Date: Fri Feb 15 14:42:00 2013
New Revision: 1446609
URL: http://svn.apache.org/r1446609
Log:
* subversion/tests/cmdline/merge_tests.py
(conflict_aborted_mergeinfo_described_partial_merge): Remove an obsolete
comment, following r1444453.
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=1446609&r1=1446608&r2=1446609&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Feb 15 14:42:00 2013
@@ -18344,7 +18344,6 @@ def simple_merge(src_path, tgt_ospath, r
@Issue(4306)
# Test for issue #4306 'multiple editor drive file merges record wrong
# mergeinfo during conflicts'
-### TODO: Directory merges. We're only testing single-file merges so far.
def conflict_aborted_mergeinfo_described_partial_merge(sbox):
"conflicted split merge can be repeated"