[Updated] D9835: resolve: also detect new :mergediff conflict markers
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Jan 20 20:25:09 UTC 2021
Closed by commit rHG0c95b59a89f1: resolve: also detect new :mergediff conflict markers (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9835?vs=25162&id=25182
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9835/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9835
AFFECTED FILES
mercurial/filemerge.py
tests/test-resolve.t
CHANGE DETAILS
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -344,6 +344,24 @@
$ hg resolve -l
R file1
R file2
+Test with :mergediff conflict markers
+ $ hg resolve --unmark
+ $ hg resolve --re-merge -t :mergediff file2
+ merging file2
+ warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
+ [1]
+ $ hg resolve -l
+ U file1
+ U file2
+ $ hg --config commands.resolve.mark-check=abort resolve -m
+ warning: the following files still have conflict markers:
+ file2
+ abort: conflict markers detected
+ (use --all to mark anyway)
+ [20]
+ $ hg resolve -l
+ U file1
+ U file2
Test option value 'warn'
$ hg resolve --unmark
$ hg resolve -l
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -1195,7 +1195,11 @@
def hasconflictmarkers(data):
return bool(
- re.search(b"^(<<<<<<< .*|=======|>>>>>>> .*)$", data, re.MULTILINE)
+ re.search(
+ br"^(<<<<<<<.*|=======.*|------- .*|\+\+\+\+\+\+\+ .*|>>>>>>>.*)$",
+ data,
+ re.MULTILINE,
+ )
)
To: martinvonz, #hg-reviewers, spectral
Cc: spectral, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210120/3598a20f/attachment-0002.html>
More information about the Mercurial-patches
mailing list