[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1884636 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
From:       hartmannathan () apache ! org
Date:       2020-12-20 3:25:48
Message-ID: 20201220032548.66B2617A1F0 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: hartmannathan
Date: Sun Dec 20 03:25:48 2020
New Revision: 1884636

URL: http://svn.apache.org/viewvc?rev=1884636&view=rev
Log:
Fix a typo in a comment.

* subversion/tests/cmdline/merge_reintegrate_tests.py:
  (reintegrate_with_subtree_mergeinfo): Fix typo in comment
    "tolerting" -> "tolerating"

Patch by: Tim Gates (timgates42) via GitHub PR#23

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=1884636&r1=1884635&r2=1884636&view=diff
 ==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Sun Dec 20 \
03:25:48 2020 @@ -1508,7 +1508,7 @@ def reintegrate_with_subtree_mergeinfo(s
     # is all quite ugly as the intersection or multiple known issues
     # is likely to be.  However, given that none of this mergeinfo is
     # particularly harmful and that this test is *not* about issues #3669
-    # or #4309, we are tolerting it.
+    # or #4309, we are tolerating it.
     'D/gamma_moved' : Item(
       "Even newer content", props={SVN_PROP_MERGEINFO :
                                    '/A/D/gamma_moved:2-7,9-12\n'


[prev in list] [next in list] [prev in thread] [next in thread]