svn commit: r1371832 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Fri Aug 10 22:28:24 2012
New Revision: 1371832

URL: http://svn.apache.org/viewvc?rev=1371832&view=rev
Log:
Remove a comment in merge_tests.py 78 that has been wrong since the change
made in r871974 ("Fix issue #3067, 'subtrees that don't exist at the start
or end of a merge range shouldn't break the merge'").

* subversion/tests/cmdline/merge_tests.py
  (dont_merge_revs_into_subtree_that_predate_it): Remove a 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=1371832&r1=1371831&r2=1371832&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Aug 10 22:28:24 2012
@@ -11191,9 +11191,6 @@ def dont_merge_revs_into_subtree_that_pr
                                      H_COPY_path)
 
   # H_COPY needs r6-9 applied while H_COPY/nu needs only 6,8-9.
-  # This means r6 will be done as a separate editor drive targeted
-  # on H_COPY.  But r6 was only the copy of A/D/H to H_COPY and
-  # so is a no-op and there will no notification for r6.
   svntest.actions.run_and_verify_svn(
     None,
     expected_merge_output(