[PATCH 3 of 8 RFC] update: when guarding, abort on anything that prompts for user input
Laurens Holst
laurens.nospam at grauw.nl
Wed Dec 21 13:45:53 CST 2011
# HG changeset patch
# User Laurens Holst <laurens.hg at grauw.nl>
# Date 1324436692 -3600
# Node ID 0fe9df236d957abc682c75d71910fa041c7390fd
# Parent 41d3bb4d1ef5bdc3a68214123da13f7c7935898f
update: when guarding, abort on anything that prompts for user input
Just like we dont want deal with merge tools, we also dont want to deal with
prompts asking us to pick file a or b.
diff -r 41d3bb4d1ef5 -r 0fe9df236d95 mercurial/merge.py
--- a/mercurial/merge.py Wed Dec 21 03:55:57 2011 +0100
+++ b/mercurial/merge.py Wed Dec 21 04:04:52 2011 +0100
@@ -640,7 +640,9 @@
for a in action:
f, m = a[:2]
- if m == "m":
+ if m == "m" or m == "pr" or m == "pg" or \
+ ((m == "e" or m == "g") and a[2] == "pf") or \
+ (m == "m" and a[4] == "pf"):
return False
return True
More information about the Mercurial-devel
mailing list