diff tests/test-completion.t @ 38453:5cdfc20bfd5f

graft: introduce --abort flag to abort interrupted graft This patch introduces a new --abort flag to `hg graft` command which aborts an interrupted graft and rollbacks to the state before graft. The behavior when some of grafted changeset get's published while interrupted graft or we have new descendants on grafted changesets is same as that of rebase which is warn the user, don't strip and abort the abort the graft. Tests are added for the new flag. .. feature:: `hg graft` now has a `--abort` flag which aborts the interrupted graft and rollbacks to state before the graft. Differential Revision: https://phab.mercurial-scm.org/D3754
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 25 May 2018 18:16:38 +0530
parents 7fbb5d76c555
children 622f79e3a1cb
line wrap: on
line diff
--- a/tests/test-completion.t	Fri Jun 15 02:46:34 2018 +0530
+++ b/tests/test-completion.t	Fri May 25 18:16:38 2018 +0530
@@ -312,7 +312,7 @@
   debugwireargs: three, four, five, ssh, remotecmd, insecure
   debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
   files: rev, print0, include, exclude, template, subrepos
-  graft: rev, continue, stop, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
+  graft: rev, continue, stop, abort, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
   grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, allfiles, user, date, template, include, exclude
   heads: rev, topo, active, closed, style, template
   help: extension, command, keyword, system