You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/03/15 14:43:03 UTC
svn commit: r1081781 -
/subversion/trunk/subversion/tests/cmdline/log_tests.py
Author: pburba
Date: Tue Mar 15 13:43:02 2011
New Revision: 1081781
URL: http://svn.apache.org/viewvc?rev=1081781&view=rev
Log:
* subversion/tests/cmdline/log_tests.py
(check_merge_results): Update doc string.
Modified:
subversion/trunk/subversion/tests/cmdline/log_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1081781&r1=1081780&r2=1081781&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Tue Mar 15 13:43:02 2011
@@ -1143,8 +1143,10 @@ Log message for revision 3.
def check_merge_results(log_chain, expected_merges=None,
expected_reverse_merges=None):
'''Check LOG_CHAIN to see if the log information contains 'Merged via'
- information indicated by EXPECTED_MERGES. EXPECTED_MERGES is a dictionary
- whose key is the merged revision, and whose value is the merging revision.'''
+ and/or 'Reverse Merged via' information indicated by EXPECTED_MERGES and
+ EXPECTED_REVERSE_MERGES respectively. EXPECTED_MERGES and
+ EXPECTED_REVERSE_MERGES are dictionaries whose keys are the merged
+ revisions, and whose values are the merging revisions.'''
# Check to see if the number and values of the revisions is correct
for log in log_chain: