This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5241

tests: fix a couple typos in test-resolve.t comments and add a comment
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8785d66edd6e: tests: fix a couple typos in test-resolve.t comments and add a comment

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 (6 lines)

Diff 12478

tests/test-resolve.t

$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 U file2
$ hg --config commands.resolve.mark-check=nope resolve -m $ hg --config commands.resolve.mark-check=nope resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2
Test explicitly setting the otion to 'none' Test explicitly setting the option to 'none'
$ hg resolve --unmark $ hg resolve --unmark
$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 U file2
$ hg --config commands.resolve.mark-check=none resolve -m $ hg --config commands.resolve.mark-check=none resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg resolve -l $ hg resolve -l
R emp1 R emp1
R emp2 R emp2
R emp3 R emp3
Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given): Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given):
=============================================================================================== =================================================================================================
$ hg resolve -u emp1 $ hg resolve -u emp1
$ hg resolve -l $ hg resolve -l
U emp1 U emp1
R emp2 R emp2
R emp3 R emp3
$ hg resolve -l $ hg resolve -l
R emp1 R emp1
R emp2 R emp2
R emp3 R emp3
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Done with commands.resolve.confirm tests:
$ cd .. $ cd ..