Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/error.py @ 35128: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 61714510220d
children c6a7b99f150a
comparison
equal deleted inserted replaced
35127:f6f8b7c8919a 35128:795bfa2a9103
299 """error raised when a command is not able to read its state from file""" 299 """error raised when a command is not able to read its state from file"""
300 __bytes__ = _tobytes 300 __bytes__ = _tobytes
301 301
302 class PeerTransportError(Abort): 302 class PeerTransportError(Abort):
303 """Transport-level I/O error when communicating with a peer repo.""" 303 """Transport-level I/O error when communicating with a peer repo."""
304
305 class InMemoryMergeConflictsError(Exception):
306 """Exception raised when merge conflicts arose during an in-memory merge."""
307 __bytes__ = _tobytes