Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 49886:becd16690cbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debug: add a config to abort update early This is useful to benchmark the parts of [hg update] that come before the parallel worker.
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Fri, 06 Jan 2023 16:01:31 +0000
parents 79b2c98ab7b4
children 3aa8e569478a
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Jan 11 16:51:37 2023 +0400
+++ b/mercurial/merge.py	Fri Jan 06 16:01:31 2023 +0000
@@ -1142,6 +1142,8 @@
             followcopies,
         )
         _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce)
+        if repo.ui.configbool(b'devel', b'debug.abort-update'):
+            exit(1)
 
     else:  # only when merge.preferancestor=* - the default
         repo.ui.note(