D6579: abort: added support for unshelve

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Mon Jul 8 13:09:24 EDT 2019


mharbison72 added inline comments.

INLINE COMMENTS

> test-shelve2.t:734
> +  abort: merge does not support 'hg abort' (stripbased !)
> +  (use 'hg commit' or 'hg merge --abort') (stripbased !)
>    [255]

I think that you can eliminate the duplication with this:

  abort: no unshelve in progress (abortflag !)
  abort: merge does not support 'hg abort' (no-abortflag !)
  (use 'hg commit' or 'hg merge --abort') (no-abortflag !)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6579/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6579

To: taapas1128, #hg-reviewers
Cc: mharbison72, pulkit, mercurial-devel


More information about the Mercurial-devel mailing list