Mercurial > hg > mercurial-source

changeset 35888:795bfa2a9103

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: add InMemoryMergeConflictsError We'll raise this exception in the merge code, and in-memory users like rebase can catch it and retry without IMM. Differential Revision: https://phab.mercurial-scm.org/D1210
author Phil Cohen <phillco@fb.com>
date Wed, 15 Nov 2017 21:07:30 -0800
parents f6f8b7c8919a
children 4b288d118d8b
files mercurial/error.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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