Mercurial > hg
changeset 44383:218feb1a7e00
graft: always allow hg graft --base . (issue6248)
`hg graft --base . -r abc` is rejected before this change with a
"nothing to merge" error, if `abc` does not descend from `.`.
This looks like an artifact of the implementation rather than intended
behavior. It makes perfect sense to apply the diff between `.` and
`abc` to the working copy (i.e. degenerate into `hg revert`),
regardless of what `abc` is.
Differential Revision: https://phab.mercurial-scm.org/D8127
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Mon, 17 Feb 2020 20:30:03 -0500 |
| parents | f0027a3dd7cb |
| children | 6689cebacb32 |
| files | mercurial/merge.py tests/test-graft.t |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Feb 19 17:30:04 2020 +0100 +++ b/mercurial/merge.py Mon Feb 17 20:30:03 2020 -0500 @@ -2654,10 +2654,15 @@ # to copy commits), and 2) informs update that the incoming changes are # newer than the destination so it doesn't prompt about "remote changed foo # which local deleted". + # We also pass mergeancestor=True when base is the same revision as p1. 2) + # doesn't matter as there can't possibly be conflicts, but 1) is necessary. wctx = wctx or repo[None] pctx = wctx.p1() base = base or ctx.p1() - mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node()) + mergeancestor = ( + repo.changelog.isancestor(pctx.node(), ctx.node()) + or pctx.rev() == base.rev() + ) stats = update( repo,
--- a/tests/test-graft.t Wed Feb 19 17:30:04 2020 +0100 +++ b/tests/test-graft.t Mon Feb 17 20:30:03 2020 -0500 @@ -813,13 +813,14 @@ note: graft of 19:9627f653b421 created no changes to commit grafting 0:68795b066622 "0" -graft --force after backout +graft --force after backout. Do the backout with graft too, to make +sure we support issue6248. $ echo abc > a $ hg ci -m 24 - $ hg backout 24 - reverting a - changeset 25:71c4e63d4f98 backs out changeset 24:2e7ea477be26 + $ hg graft --base . -r ".^" --no-commit + grafting 23:b1cac6de36a9 "0" + $ hg commit -m 'Backed out changeset 2e7ea477be26' $ hg graft 24 skipping ancestor revision 24:2e7ea477be26 [255]