Mercurial > public > mercurial-scm > hg-stable
diff tests/test-resolve.t @ 28402:7f77e71e5d7e
resolve: when pats do not match, hint about path:
Suggest a command that would probably work.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 04:31:34 +0000 |
| parents | 8abd9f785030 |
| children | 4acd5651ffa2 |
line wrap: on
line diff
--- a/tests/test-resolve.t Wed Mar 09 08:21:57 2016 +0100 +++ b/tests/test-resolve.t Thu Dec 24 04:31:34 2015 +0000 @@ -53,6 +53,34 @@ arguments do not match paths that need resolving $ hg resolve -l does-not-exist +tell users how they could have used resolve + + $ mkdir nested + $ cd nested + $ hg resolve -m file1 + arguments do not match paths that need resolving + (try: hg resolve -m path:file1) + $ hg resolve -m file1 filez + arguments do not match paths that need resolving + (try: hg resolve -m path:file1 path:filez) + $ hg resolve -m path:file1 path:filez + $ hg resolve -l + R file1 + U file2 + $ hg resolve -m filez file2 + arguments do not match paths that need resolving + (try: hg resolve -m path:filez path:file2) + $ hg resolve -m path:filez path:file2 + (no more unresolved files) + $ hg resolve -l + R file1 + R file2 + +cleanup + $ hg resolve -u + $ cd .. + $ rmdir nested + don't allow marking or unmarking driver-resolved files $ cat > $TESTTMP/markdriver.py << EOF