[Updated] D11998: simplemerge: delete unused exception class `CantReprocessAndShowBase`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Jan 17 13:16:24 UTC 2022
Closed by commit rHG24796c97c0e4: simplemerge: delete unused exception class `CantReprocessAndShowBase` (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11998?vs=31654&id=31676
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11998/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11998
AFFECTED FILES
mercurial/simplemerge.py
tests/test-simplemerge.py
CHANGE DETAILS
diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -48,9 +48,6 @@
)
-CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
-
-
def split_lines(t):
return util.stringio(t).readlines()
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -27,10 +27,6 @@
from .utils import stringutil
-class CantReprocessAndShowBase(Exception):
- pass
-
-
def intersect(ra, rb):
"""Given two ranges return the range where they intersect or None.
To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220117/457a6581/attachment-0002.html>
More information about the Mercurial-patches
mailing list