From cde6b3242fa9f02c857273115a0f3bf670a1339d Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Wed, 10 Feb 2016 00:18:51 -0800 Subject: [PATCH] mergedriver: make it clear that artifacts must be regenerated --- mergedriver.py | 2 +- tests/test-mergedriver.t | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mergedriver.py b/mergedriver.py index 353c09ddf3..74d0036c9d 100644 --- a/mergedriver.py +++ b/mergedriver.py @@ -83,7 +83,7 @@ def wrapresolve(orig, ui, repo, *pats, **opts): ui.setconfig('experimental', 'mergedriver', '', 'mergedriver extension') ui.warn(_('warning: skipping merge driver ' - '(you will need to regenerate files manually)\n')) + '(you MUST regenerate artifacts afterwards)\n')) try: ret = orig(ui, repo, *pats, **opts) diff --git a/tests/test-mergedriver.t b/tests/test-mergedriver.t index c0d9625a56..108333d26e 100644 --- a/tests/test-mergedriver.t +++ b/tests/test-mergedriver.t @@ -202,7 +202,7 @@ mark a file driver-resolved, and leave others unresolved (but skip merge driver) $ hg debugmergestate | grep 'merge driver:' merge driver: python:$TESTTMP/mergedriver-auto1.py (state "m") $ hg resolve --all --skip - warning: skipping merge driver (you will need to regenerate files manually) + warning: skipping merge driver (you MUST regenerate artifacts afterwards) merging bar.txt warning: conflicts while merging bar.txt! (edit, then use 'hg resolve --mark') [1] @@ -430,7 +430,7 @@ this shouldn't abort U foo.txt $ hg resolve --mark --all --skip - warning: skipping merge driver (you will need to regenerate files manually) + warning: skipping merge driver (you MUST regenerate artifacts afterwards) (no more unresolved files) $ hg debugmergestate | grep 'merge driver:' [1] @@ -482,7 +482,7 @@ this should disable the merge driver $ hg help resolve | grep -- '--skip' --skip skip merge driver $ hg resolve --all --skip - warning: skipping merge driver (you will need to regenerate files manually) + warning: skipping merge driver (you MUST regenerate artifacts afterwards) (no more unresolved files) this should go through