##// END OF EJS Templates
resolve: print warning when no work performed (issue4208)...
Gregory Szorc -
r21265:232de244 default
parent child Browse files
Show More
@@ -4934,10 +4934,13 b' def resolve(ui, repo, *pats, **opts):'
4934 m = scmutil.match(repo[None], pats, opts)
4934 m = scmutil.match(repo[None], pats, opts)
4935 ret = 0
4935 ret = 0
4936
4936
4937 didwork = False
4937 for f in ms:
4938 for f in ms:
4938 if not m(f):
4939 if not m(f):
4939 continue
4940 continue
4940
4941
4942 didwork = True
4943
4941 if show:
4944 if show:
4942 if nostatus:
4945 if nostatus:
4943 ui.write("%s\n" % f)
4946 ui.write("%s\n" % f)
@@ -4970,6 +4973,10 b' def resolve(ui, repo, *pats, **opts):'
4970 util.rename(a + ".resolve", a + ".orig")
4973 util.rename(a + ".resolve", a + ".orig")
4971
4974
4972 ms.commit()
4975 ms.commit()
4976
4977 if not didwork and pats:
4978 ui.warn(_("arguments do not match paths that need resolved\n"))
4979
4973 return ret
4980 return ret
4974
4981
4975 @command('revert',
4982 @command('revert',
@@ -31,6 +31,10 b' resolve -l should contain an unresolved '
31 $ hg resolve -l
31 $ hg resolve -l
32 U file
32 U file
33
33
34 resolving an unknown path emits a warning
35 $ hg resolve -m does-not-exist
36 arguments do not match paths that need resolved
37
34 resolve the failure
38 resolve the failure
35
39
36 $ echo resolved > file
40 $ echo resolved > file
General Comments 0
You need to be logged in to leave comments. Login now