On 10/23/18 4:59 PM, Augie Fackler wrote:
On Oct 14, 2018, at 11:15, Mads Kiilerich <m...@kiilerich.com> wrote:
# HG changeset patch
# User Mads Kiilerich <m...@kiilerich.com>
# Date 1539529698 -7200
# Sun Oct 14 17:08:18 2018 +0200
# Node ID 258029c642d97ef663396476c63ce34dbef89b13
# Parent 38ac525b44c93fcadb3680d4ded56f1e5a0029b2
graft: introduce --base option for using custom base revision while merging
queued
Thanks.
At the sprint you had mentioned maybe being able to use this to help backing
out a merge - if you know the incantation for that maybe send that as a
follow-up for the verbose help?
IIRC, graft has other safety mechanisms that prevent using a descendant
as base. The primary use of this is to "graft merges".
Backout of merges should be possible with existing backout
functionality. The change help hinted in that direction:
+
+ For using non-ancestors as the base to backout changes, see the backout
+ command and the hidden --parent option.
(But ok, backout could use more helpful help too.)
/Mads
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
