Submitter | timeless@mozdev.org |
---|---|
Date | Feb. 12, 2016, 8:54 p.m. |
Message ID | <3f9f1a901281a14ac336.1455310450@waste.org> |
Download | mbox | patch |
Permalink | /patch/13150/ |
State | Accepted |
Delegated to: | Pierre-Yves David |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3928,7 +3928,7 @@ except IOError as inst: if inst.errno != errno.ENOENT: raise - raise error.Abort(_("no graft state found, can't continue")) + cmdutil.wrongtooltocontinue(repo, _('graft')) else: cmdutil.checkunfinished(repo) cmdutil.bailifchanged(repo) diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -40,6 +40,13 @@ | o test@0.public: 0 +Can't continue without starting: + + $ hg rm -q e + $ hg graft --continue + abort: no graft in progress + [255] + $ hg revert -r . -q e Need to specify a rev: