This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4447

resolve: test that we suggest a valid hg command
ClosedPublic

Authored by valentin.gatienbaron on Sep 1 2018, 6:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG213c0493cea0: resolve: test that we suggest a valid hg command

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.

Event Timeline

Closed by commit rHG213c0493cea0: resolve: test that we suggest a valid hg command (authored by valentin.gatienbaron). · Explain WhySep 2 2018, 1:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 10713

tests/test-resolve.t

(try: hg resolve -m path:file1) (try: hg resolve -m path:file1)
$ hg resolve -m file1 filez $ hg resolve -m file1 filez
arguments do not match paths that need resolving arguments do not match paths that need resolving
(try: hg resolve -m path:file1 path:filez) (try: hg resolve -m path:file1 path:filez)
$ hg resolve -m path:file1 path:filez $ hg resolve -m path:file1 path:filez
$ hg resolve -l $ hg resolve -l
R file1 R file1
U file2 U file2
$ hg resolve --re-merge filez file2
arguments do not match paths that need resolving
(try: hg resolve --re-merge path:filez path:file2)
$ hg resolve -m filez file2 $ hg resolve -m filez file2
arguments do not match paths that need resolving arguments do not match paths that need resolving
(try: hg resolve -m path:filez path:file2) (try: hg resolve -m path:filez path:file2)
$ hg resolve -m path:filez path:file2 $ hg resolve -m path:filez path:file2
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2