##// 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:

r33355:9087f999 default
r38817:bb54db4a @96 default
Show More
test-sparse-verbose-json.t
82 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-sparse-verbose-json.t
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 test sparse with --verbose and -T json
$ hg init myrepo
$ cd myrepo
$ cat > .hg/hgrc <<EOF
> [extensions]
> sparse=
> strip=
> EOF
$ echo a > show
$ echo x > hide
$ hg ci -Aqm 'initial'
$ echo b > show
$ echo y > hide
$ echo aa > show2
$ echo xx > hide2
$ hg ci -Aqm 'two'
Verify basic --include and --reset
$ hg up -q 0
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --include 'hide' -Tjson
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 [
{
"exclude_rules_added": 0,
"files_added": 0,
"files_conflicting": 0,
"files_dropped": 1,
"include_rules_added": 1,
"profiles_added": 0
}
]
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --clear-rules
$ hg debugsparse --include 'hide' --verbose
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 removing show
Gregory Szorc
sparse: move printing of sparse config changes function into core...
r33355 Profiles changed: 0
Include rules changed: 1
Exclude rules changed: 0
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --reset -Tjson
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 [
{
"exclude_rules_added": 0,
"files_added": 1,
"files_conflicting": 0,
"files_dropped": 0,
"include_rules_added": -1,
"profiles_added": 0
}
]
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --include 'hide'
$ hg debugsparse --reset --verbose
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 getting show
Gregory Szorc
sparse: move printing of sparse config changes function into core...
r33355 Profiles changed: 0
Include rules changed: -1
Exclude rules changed: 0
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289
Verifying that problematic files still allow us to see the deltas when forcing:
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --include 'show*'
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 $ touch hide
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --delete 'show*' --force -Tjson
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 pending changes to 'hide'
[
{
"exclude_rules_added": 0,
"files_added": 0,
"files_conflicting": 1,
"files_dropped": 0,
"include_rules_added": -1,
"profiles_added": 0
}
]
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --include 'show*' --force
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 pending changes to 'hide'
Gregory Szorc
sparse: rename command to debugsparse...
r33293 $ hg debugsparse --delete 'show*' --force --verbose
Gregory Szorc
sparse: vendor Facebook-developed extension...
r33289 pending changes to 'hide'
Gregory Szorc
sparse: move printing of sparse config changes function into core...
r33355 Profiles changed: 0
Include rules changed: -1
Exclude rules changed: 0