Author: julianfoad
Date: Tue Jan 24 16:36:53 2012
New Revision: 1235339
URL: http://svn.apache.org/viewvc?rev=1235339&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(natural_history_filtering): Add a diagram to help explain this test.
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=1235339&r1=1235338&r2=1235339&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Jan 24
16:36:53 2012
@@ -13449,6 +13449,12 @@ def natural_history_filtering(sbox):
#
# To set up a situation where this can occur we'll do the following:
#
+ # trunk -1-----3-4-5-6-------8----------- A
+ # \ \ \
+ # branch1 2-----------\-------9-------- A_COPY
+ # \ \
+ # branch2 7--------10---- A_COPY_2
+ #
# 1) Create a 'trunk'.
#
# 2) Copy 'trunk' to 'branch1'.
