Mercurial > public > mercurial-scm > hg

comparison mercurial/mergeutil.py @ 45518:32ce4cbaec4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergedriver: delete it The merge driver code was added in late 2015. I think '406a654b::6f045b56 & user("sid0")' is a reasonable revset for finding the relevant commits, including preparation for it. The code is very poorly tested, which makes it very hard to maintain. It seems it's only used by FB and they don't use this code base anymore, so let's remove the code to make it easier for us to maintain our product. Differential Revision: https://phab.mercurial-scm.org/D9041
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Sep 2020 22:34:36 -0700
parents 8ff1ecfadcd1
children fa87536d3d70
comparison
equal deleted inserted replaced
45517:2a68a5ec8dd0 45518:32ce4cbaec4b
15 def checkunresolved(ms): 15 def checkunresolved(ms):
16 if list(ms.unresolved()): 16 if list(ms.unresolved()):
17 raise error.Abort( 17 raise error.Abort(
18 _(b"unresolved merge conflicts (see 'hg help resolve')") 18 _(b"unresolved merge conflicts (see 'hg help resolve')")
19 ) 19 )
20 if ms.mdstate() != b's' or list(ms.driverresolved()):
21 raise error.Abort(
22 _(b'driver-resolved merge conflicts'),
23 hint=_(b'run "hg resolve --all" to resolve'),
24 )