This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3897

tests: prevent conflict markers in test case from triggering warnings
ClosedPublic

Authored by hooper on Jul 9 2018, 6:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG02850baddadd: tests: prevent conflict markers in test case from triggering warnings
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

hooper created this revision.Jul 9 2018, 6:37 PM
Closed by commit rHG02850baddadd: tests: prevent conflict markers in test case from triggering warnings (authored by hooper). · Explain WhyJul 11 2018, 7:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-simplemerge.py (10 lines)

Diff 9530

tests/test-simplemerge.py

The Nameless is the origin of Heaven and Earth; The Nameless is the origin of Heaven and Earth;
The Named is the mother of all things. The Named is the mother of all things.
Therefore let there always be non-being, Therefore let there always be non-being,
so we may see their subtlety, so we may see their subtlety,
And let there always be being, And let there always be being,
so we may see their result. so we may see their result.
The two are the same, The two are the same,
But after they are produced, But after they are produced,
they have different names. they have different names.\
<<<<<<< LAO \n<<<<<<< LAO\
======= \n=======
-- The Way of Lao-Tzu, tr. Wing-tsit Chan -- The Way of Lao-Tzu, tr. Wing-tsit Chan
\
>>>>>>> TAO \n>>>>>>> TAO
""") """)
class TestMerge3(TestCase): class TestMerge3(TestCase):
def log(self, msg): def log(self, msg):
pass pass
def test_no_changes(self): def test_no_changes(self):
"""No conflicts because nothing changed""" """No conflicts because nothing changed"""