Mercurial > hg

changeset 48565:7ed4c4753891

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: delete unused exception class `CantReprocessAndShowBase` The only user was removed in f18830651811 (simplemerge: burn "minimal" feature to the ground, 2014-08-05). Differential Revision: https://phab.mercurial-scm.org/D11998
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 14 Jan 2022 08:44:36 -0800
parents c2537aec3bb6
children 50de08904c63
files mercurial/simplemerge.py tests/test-simplemerge.py
diffstat 2 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Tue Jan 11 22:13:56 2022 -0800
+++ b/mercurial/simplemerge.py	Fri Jan 14 08:44:36 2022 -0800
@@ -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.
 
--- a/tests/test-simplemerge.py	Tue Jan 11 22:13:56 2022 -0800
+++ b/tests/test-simplemerge.py	Fri Jan 14 08:44:36 2022 -0800
@@ -48,9 +48,6 @@
         )
 
 
-CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
-
-
 def split_lines(t):
     return util.stringio(t).readlines()