Patchwork D1210: error: add InMemoryMergeConflictsError

login
register
mail settings
Submitter phabricator
Date Nov. 20, 2017, 11:36 p.m.
Message ID <ef8a26d5231bc3f578e652d6b635309f@localhost.localdomain>
Download mbox | patch
Permalink /patch/25683/
State Not Applicable
Headers show

Comments

phabricator - Nov. 20, 2017, 11:36 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG795bfa2a9103: error: add InMemoryMergeConflictsError (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1210?vs=3059&id=3685

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

AFFECTED FILES
  mercurial/error.py

CHANGE DETAILS




To: phillco, martinvonz, #hg-reviewers, pulkit, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/error.py b/mercurial/error.py
--- a/mercurial/error.py
+++ b/mercurial/error.py
@@ -301,3 +301,7 @@ 
 
 class PeerTransportError(Abort):
     """Transport-level I/O error when communicating with a peer repo."""
+
+class InMemoryMergeConflictsError(Exception):
+    """Exception raised when merge conflicts arose during an in-memory merge."""
+    __bytes__ = _tobytes