Mercurial > public > mercurial-scm > hg
diff tests/test-completion.t @ 40434:3c0d5016b2be
graft: introduce --base option for using custom base revision while merging
The graft command usually performs an internal merge of the current parent
revision with the graft revision, using p1 of the grafted revision as base for
the merge.
As a trivial extension of this, we introduce the --base option to allow for
using another base revision.
This can be used as a building block for grafting and collapsing multiple
changesets at once, or for grafting the resulting change from a merge as a
single simple change. (This is kind of similar to backout --parent ... only
different: this graft base must be an ancestor, but is usually *not* a parent.)
This is probably an advanced use case, and we do thus not show it in the
non-verbose help.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 14 Oct 2018 17:08:18 +0200 |
| parents | fa88170c10bb |
| children | 9b8d1ad851f8 |
line wrap: on
line diff
--- a/tests/test-completion.t Thu Oct 18 12:31:06 2018 +0200 +++ b/tests/test-completion.t Sun Oct 14 17:08:18 2018 +0200 @@ -308,7 +308,7 @@ export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template files: rev, print0, include, exclude, template, subrepos forget: interactive, include, exclude, dry-run - graft: rev, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run + graft: rev, base, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude heads: rev, topo, active, closed, style, template help: extension, command, keyword, system