This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5242

tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc
ClosedPublic

Authored by spectral on Nov 7 2018, 6:45 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb93157f69f46: tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc
Summary

I want to add tests after these tests that create a new repo and use it, and was
confused for a bit as to why they were seeing different behavior than I
expected.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-resolve.t (2 lines)

Diff 12479

tests/test-resolve.t

merging emp3 merging emp3
warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
[1] [1]
Test when config option is set: Test when config option is set:
============================== ==============================
$ cat >> $HGRCPATH << EOF $ cat >> .hg/hgrc << EOF
> [ui] > [ui]
> interactive = True > interactive = True
> [commands] > [commands]
> resolve.confirm = True > resolve.confirm = True
> EOF > EOF
$ hg resolve $ hg resolve
abort: no files or directories specified abort: no files or directories specified