You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ha...@apache.org on 2020/12/20 03:25:48 UTC

svn commit: r1884636 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

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'

Re: svn commit: r1884636 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

Posted by Nathan Hartman <ha...@gmail.com>.
On Mon, Dec 21, 2020 at 2:02 AM Daniel Shahaf <d....@daniel.shahaf.name> wrote:
>
> hartmannathan@apache.org wrote on Sun, 20 Dec 2020 03:25 -0000:
> > Patch by: Tim Gates (timgates42) via GitHub PR#23
>
> I don't think contribulyzer would DTRT on the "via GitHub PR#23" part.
> Recommend to move it to a next-line parenthetical.

Thanks. Fixed:

> Author: hartmannathan
> Revision: 1884636
> Modified property: svn:log
>
> Modified: svn:log at Mon Dec 21 15:07:47 2020
> ------------------------------------------------------------------------------
> --- svn:log (original)
> +++ svn:log Mon Dec 21 15:07:47 2020
> @@ -4,4 +4,5 @@ Fix a typo in a comment.
>    (reintegrate_with_subtree_mergeinfo): Fix typo in comment
>      "tolerting" -> "tolerating"
>
> -Patch by: Tim Gates (timgates42) via GitHub PR#23
> +Patch by: Tim Gates (timgates42)
> +          (via GitHub PR#23)
>

Cheers,
Nathan

Re: svn commit: r1884636 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hartmannathan@apache.org wrote on Sun, 20 Dec 2020 03:25 -0000:
> Patch by: Tim Gates (timgates42) via GitHub PR#23

I don't think contribulyzer would DTRT on the "via GitHub PR#23" part.
Recommend to move it to a next-line parenthetical.

Re: svn commit: r1884636 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hartmannathan@apache.org wrote on Sun, 20 Dec 2020 03:25 -0000:
> Patch by: Tim Gates (timgates42) via GitHub PR#23

I don't think contribulyzer would DTRT on the "via GitHub PR#23" part.
Recommend to move it to a next-line parenthetical.