facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

mergedriver: make it clear that artifacts must be regenerated

Browse Source
This commit is contained in:
Siddharth Agarwal 2016-02-10 00:18:51 -08:00
parent 18d788d4c8
commit cde6b3242f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mergedriver.py
View File

@ -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)

6
tests/test-mergedriver.t
View File

@ -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