subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1428052 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
Date Wed, 02 Jan 2013 21:13:19 GMT
Author: julianfoad
Date: Wed Jan  2 21:13:19 2013
New Revision: 1428052

URL: http://svn.apache.org/viewvc?rev=1428052&view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
  (reintegrate_with_subtree_mergeinfo): Update a comment that's been wrong
    since r874380.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1428052&r1=1428051&r2=1428052&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Jan  2 21:13:19
2013
@@ -1267,8 +1267,7 @@ def reintegrate_with_subtree_mergeinfo(s
   #      rev N+3.  The renamed subtree on 'branch' now has additional explicit
   #      mergeinfo decribing the synch merge from trunk@N+1 to trunk@N+2.
   #
-  #   E) Reintegrate 'branch' to 'trunk'.  This fails as it appears not all
-  #      of 'trunk' was previously merged to 'branch'
+  #   E) Reintegrate 'branch' to 'trunk'.
   #
   #                                       Step:   A   B    C   D    E
   #   A_COPY_3    ---[9]--



Mime
View raw message