50 resolving an unknown path should emit a warning, but not for -l |
50 resolving an unknown path should emit a warning, but not for -l |
51 |
51 |
52 $ hg resolve -m does-not-exist |
52 $ hg resolve -m does-not-exist |
53 arguments do not match paths that need resolving |
53 arguments do not match paths that need resolving |
54 $ hg resolve -l does-not-exist |
54 $ hg resolve -l does-not-exist |
|
55 |
|
56 tell users how they could have used resolve |
|
57 |
|
58 $ mkdir nested |
|
59 $ cd nested |
|
60 $ hg resolve -m file1 |
|
61 arguments do not match paths that need resolving |
|
62 (try: hg resolve -m path:file1) |
|
63 $ hg resolve -m file1 filez |
|
64 arguments do not match paths that need resolving |
|
65 (try: hg resolve -m path:file1 path:filez) |
|
66 $ hg resolve -m path:file1 path:filez |
|
67 $ hg resolve -l |
|
68 R file1 |
|
69 U file2 |
|
70 $ hg resolve -m filez file2 |
|
71 arguments do not match paths that need resolving |
|
72 (try: hg resolve -m path:filez path:file2) |
|
73 $ hg resolve -m path:filez path:file2 |
|
74 (no more unresolved files) |
|
75 $ hg resolve -l |
|
76 R file1 |
|
77 R file2 |
|
78 |
|
79 cleanup |
|
80 $ hg resolve -u |
|
81 $ cd .. |
|
82 $ rmdir nested |
55 |
83 |
56 don't allow marking or unmarking driver-resolved files |
84 don't allow marking or unmarking driver-resolved files |
57 |
85 |
58 $ cat > $TESTTMP/markdriver.py << EOF |
86 $ cat > $TESTTMP/markdriver.py << EOF |
59 > '''mark and unmark files as driver-resolved''' |
87 > '''mark and unmark files as driver-resolved''' |