Mercurial > hg
comparison tests/test-rebase-mq.t @ 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 | 4edd427f34c1 |
children | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
44830:91e509a12dbc | 44906:e5043679bfcc |
---|