Mercurial > hg
view .arcconfig @ 44906:e5043679bfcc stable
graft-state: save --base in graft's state, fixing bug with graft --continue
Without this change, running graft --continue after grafting a merge commit using --base
(and encountering conflicts) will output "skipping ungraftable merge revision" even though
we specified a base in the initial graft command.
Graft's improve behaviour is reflected in test-graft.t.
Differential Revision: https://phab.mercurial-scm.org/D8578
author | Charles Chamberlain <cchamberlain@janestreet.com> |
---|---|
date | Tue, 26 May 2020 11:14:07 -0400 |
parents | ff396501e841 |
children |
line wrap: on
line source
{ "conduit_uri": "https://phab.mercurial-scm.org/api", "phabricator.uri": "https://phab.mercurial-scm.org/", "repository.callsign": "HG", "arc.land.onto.default": "@", "base": "hg:.^" }