##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r37433:c2c8962a default
r38817:bb54db4a @96 default
Show More
test-sparse-requirement.t
68 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-sparse-requirement.t
$ hg init repo
$ cd repo
$ touch a.html b.html c.py d.py
$ cat > frontend.sparse << EOF
> [include]
> *.html
> EOF
$ hg -q commit -A -m initial
$ echo 1 > a.html
$ echo 1 > c.py
$ hg commit -m 'commit 1'
Enable sparse profile
$ cat .hg/requires
dotencode
fncache
generaldelta
revlogv1
store
testonly-simplestore (reposimplestore !)
$ hg debugsparse --config extensions.sparse= --enable-profile frontend.sparse
$ ls
a.html
b.html
Requirement for sparse added when sparse is enabled
$ cat .hg/requires
dotencode
exp-sparse
fncache
generaldelta
revlogv1
store
testonly-simplestore (reposimplestore !)
Client without sparse enabled reacts properly
$ hg files
abort: repository is using sparse feature but sparse is not enabled; enable the "sparse" extensions to access!
[255]
Requirement for sparse is removed when sparse is disabled
$ hg debugsparse --reset --config extensions.sparse=
$ cat .hg/requires
dotencode
fncache
generaldelta
revlogv1
store
testonly-simplestore (reposimplestore !)
And client without sparse can access
$ hg files
a.html
b.html
c.py
d.py
frontend.sparse