Patchwork D3897: tests: prevent conflict markers in test case from triggering warnings

login
register
mail settings
Submitter phabricator
Date July 9, 2018, 10:37 p.m.
Message ID <differential-rev-PHID-DREV-z5kmkp7vduvtjfg3luus-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32720/
State Superseded
Headers show

Comments

phabricator - July 9, 2018, 10:37 p.m.
hooper created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Broadly, having lines that begin with several '<' tends to trigger tools that
  try to warn you about unresolved conflicts. It will save some headaches to
  tweak this string literal to avoid that.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3897

AFFECTED FILES
  tests/test-simplemerge.py

CHANGE DETAILS




To: hooper, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -109,13 +109,13 @@ 
        so we may see their result.
      The two are the same,
      But after they are produced,
-       they have different names.
-<<<<<<< LAO
-=======
+       they have different names.\
+\n<<<<<<< LAO\
+\n=======
 
        -- The Way of Lao-Tzu, tr. Wing-tsit Chan
-
->>>>>>> TAO
+\
+\n>>>>>>> TAO
 """)
 
 class TestMerge3(TestCase):