This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8423

graft: exit 1 on conflicts, like merge
ClosedPublic

Authored by valentin.gatienbaron on Apr 14 2020, 7:29 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG16c361152133: graft: exit 1 on conflicts, like merge
Summary

It's more consistent, and makes it nicer to script around hg if you
don't have to ignore exit code 255, which is the error code for
basically everything in hg.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit accepted this revision.Apr 16 2020, 4:09 AM
This revision is now accepted and ready to land.Apr 16 2020, 4:09 AM
valentin.gatienbaron added a commit: rHG16c361152133: graft: exit 1 on conflicts, like merge.Apr 16 2020, 12:54 PM
Closed by commit rHG16c361152133: graft: exit 1 on conflicts, like merge (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21142

mercurial/commands.py

- land a feature branch as one changeset:: - land a feature branch as one changeset::
hg up -cr default hg up -cr default
hg graft -r featureX --base "ancestor('featureX', 'default')" hg graft -r featureX --base "ancestor('featureX', 'default')"
See :hg:`help revisions` for more about specifying revisions. See :hg:`help revisions` for more about specifying revisions.
Returns 0 on successful completion. Returns 0 on successful completion, 1 if there are unresolved files.
''' '''
with repo.wlock(): with repo.wlock():
return _dograft(ui, repo, *revs, **opts) return _dograft(ui, repo, *revs, **opts)
def _dograft(ui, repo, *revs, **opts): def _dograft(ui, repo, *revs, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if revs and opts.get(b'rev'): if revs and opts.get(b'rev'):
stats = mergemod.graft(repo, ctx, base, [b'local', b'graft']) stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
# report any conflicts # report any conflicts
if stats.unresolvedcount > 0: if stats.unresolvedcount > 0:
# write out state for --continue # write out state for --continue
nodes = [repo[rev].hex() for rev in revs[pos:]] nodes = [repo[rev].hex() for rev in revs[pos:]]
statedata[b'nodes'] = nodes statedata[b'nodes'] = nodes
stateversion = 1 stateversion = 1
graftstate.save(stateversion, statedata) graftstate.save(stateversion, statedata)
hint = _(b"use 'hg resolve' and 'hg graft --continue'") ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
raise error.Abort( ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
_(b"unresolved conflicts, can't continue"), hint=hint return 1
)
else: else:
cont = False cont = False
# commit if --no-commit is false # commit if --no-commit is false
if not opts.get(b'no_commit'): if not opts.get(b'no_commit'):
node = repo.commit( node = repo.commit(
text=message, user=user, date=date, extra=extra, editor=editor text=message, user=user, date=date, extra=extra, editor=editor
) )

tests/test-bisect.t

user: test user: test
date: Thu Jan 01 00:00:06 1970 +0000 date: Thu Jan 01 00:00:06 1970 +0000
summary: msg 6 summary: msg 6
$ hg graft -q 15 $ hg graft -q 15
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg bisect --reset $ hg bisect --reset
$ hg up -C . $ hg up -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Check that bisect does not break on obsolete changesets Check that bisect does not break on obsolete changesets
========================================================= =========================================================
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF

tests/test-copies-unrelated.t

BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 1 $ hg graft -r 1
grafting 1:* "modify x" (glob) grafting 1:* "modify x" (glob)
file 'x' was deleted in local [local] but was modified in other [graft]. file 'x' was deleted in local [local] but was modified in other [graft].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Add x, remove it, then add it back, then rename x to y. Similar to the case Add x, remove it, then add it back, then rename x to y. Similar to the case
above, but here the break in history is before the rename. above, but here the break in history is before the rename.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ echo x2 > x $ echo x2 > x
$ hg ci -m 'modify x' $ hg ci -m 'modify x'
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2 $ hg graft -r 2
grafting 2:* "modify x again" (glob) grafting 2:* "modify x again" (glob)
file 'x' was deleted in local [local] but was modified in other [graft]. file 'x' was deleted in local [local] but was modified in other [graft].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
#endif #endif
$ hg co -qC 2 $ hg co -qC 2
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 5 $ hg graft -r 5
grafting 5:* "rename x to y"* (glob) grafting 5:* "rename x to y"* (glob)
file 'x' was deleted in other [graft] but was modified in local [local]. file 'x' was deleted in other [graft] but was modified in local [local].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Add x, remove it, then add it back, rename x to y from the first commit. Add x, remove it, then add it back, rename x to y from the first commit.
Similar to the case above, but here the break in history is parallel to the Similar to the case above, but here the break in history is parallel to the
rename. rename.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ hg rm x $ hg rm x
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 3 $ hg graft -r 3
grafting 3:* "rename x to y" (glob) grafting 3:* "rename x to y" (glob)
file 'x' was deleted in other [graft] but was modified in local [local]. file 'x' was deleted in other [graft] but was modified in local [local].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Add x on two branches, then rename x to y on one side. Similar to the case Add x on two branches, then rename x to y on one side. Similar to the case
above, but here the break in history is via the base commit. above, but here the break in history is via the base commit.
$ newrepo $ newrepo
$ echo a > a $ echo a > a
$ hg ci -Aqm 'base' $ hg ci -Aqm 'base'
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 2 $ hg graft -r 2
grafting 2:* "modify x" (glob) grafting 2:* "modify x" (glob)
file 'x' was deleted in local [local] but was modified in other [graft]. file 'x' was deleted in local [local] but was modified in other [graft].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
#endif #endif
$ hg co -qC 2 $ hg co -qC 2
BROKEN: This should succeed and merge the changes from x into y BROKEN: This should succeed and merge the changes from x into y
$ hg graft -r 5 $ hg graft -r 5
grafting 5:* "rename x to y"* (glob) grafting 5:* "rename x to y"* (glob)
file 'x' was deleted in other [graft] but was modified in local [local]. file 'x' was deleted in other [graft] but was modified in local [local].
You can use (c)hanged version, (d)elete, or leave (u)nresolved. You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u What do you want to do? u
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Copies via null revision (there shouldn't be any) Copies via null revision (there shouldn't be any)
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ hg ci -Aqm 'add x' $ hg ci -Aqm 'add x'
$ hg cp x y $ hg cp x y
$ hg ci -m 'copy x to y' $ hg ci -m 'copy x to y'
$ hg co -q null $ hg co -q null

tests/test-graft-interrupted.t

$ hg ci -m "bar to b" $ hg ci -m "bar to b"
created new head created new head
$ hg graft -r 1 -r 2 $ hg graft -r 1 -r 2
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Writing the nodes in old format to graftstate Writing the nodes in old format to graftstate
$ hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate $ hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate
$ echo foo > b $ echo foo > b
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg graft -r 1 -r 2 --user batman $ hg graft -r 1 -r 2 --user batman
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ echo wat > b $ echo wat > b
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
$ hg up '.^^' $ hg up '.^^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg graft -r 1 -r 2 --date '1234560000 120' $ hg graft -r 1 -r 2 --date '1234560000 120'
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ echo foobar > b $ echo foobar > b
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
grafting 2:8be98ac1a569 "added c" grafting 2:8be98ac1a569 "added c"
$ hg up '.^^' $ hg up '.^^'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg graft -r 1 -r 2 --log $ hg graft -r 1 -r 2 --log
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ echo foobar > b $ echo foobar > b
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:80e6d2c47cfe "added b" grafting 1:80e6d2c47cfe "added b"
[255] [255]
$ hg graft -r 3 $ hg graft -r 3
grafting 3:9150fe93bec6 "added d" grafting 3:9150fe93bec6 "added d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg graft --stop --continue $ hg graft --stop --continue
abort: cannot use '--continue' and '--stop' together abort: cannot use '--continue' and '--stop' together
[255] [255]
$ hg graft --stop -U $ hg graft --stop -U
abort: cannot specify any other flag with '--stop' abort: cannot specify any other flag with '--stop'
[255] [255]
$ hg graft -r 2 -r 3 $ hg graft -r 2 -r 3
grafting 2:155349b645be "added c" grafting 2:155349b645be "added c"
grafting 3:9150fe93bec6 "added d" grafting 3:9150fe93bec6 "added d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg graft --stop $ hg graft --stop
stopped the interrupted graft stopped the interrupted graft
working directory is now at 75b447541a9e working directory is now at 75b447541a9e
$ hg diff $ hg diff
$ hg log -G -T "{rev}:{node|short} {desc}" $ hg log -G -T "{rev}:{node|short} {desc}"
when stripping is required when stripping is required
$ hg graft -r 4 -r 5 $ hg graft -r 4 -r 5
grafting 4:863a25e1a9ea "added x" grafting 4:863a25e1a9ea "added x"
grafting 5:36b793615f78 "added foo to c" (tip) grafting 5:36b793615f78 "added foo to c" (tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg graft --continue --abort $ hg graft --continue --abort
abort: cannot use '--continue' and '--abort' together abort: cannot use '--continue' and '--abort' together
[255] [255]
$ hg graft --abort --stop $ hg graft --abort --stop
abort: cannot use '--abort' and '--stop' together abort: cannot use '--abort' and '--stop' together
[255] [255]
when stripping is not required when stripping is not required
$ hg graft -r 5 $ hg graft -r 5
grafting 5:36b793615f78 "added foo to c" (tip) grafting 5:36b793615f78 "added foo to c" (tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg abort $ hg abort
graft aborted graft aborted
working directory is now at 9150fe93bec6 working directory is now at 9150fe93bec6
$ hg log -GT "{rev}:{node|short} {desc}" $ hg log -GT "{rev}:{node|short} {desc}"
o 5:36b793615f78 added foo to c o 5:36b793615f78 added foo to c
| |
| o 4:863a25e1a9ea added x | o 4:863a25e1a9ea added x
$ hg graft -r 4 -r 5 $ hg graft -r 4 -r 5
grafting 4:863a25e1a9ea "added x" grafting 4:863a25e1a9ea "added x"
grafting 5:36b793615f78 "added foo to c" (tip) grafting 5:36b793615f78 "added foo to c" (tip)
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg log -GT "{rev}:{node|short} {desc}" $ hg log -GT "{rev}:{node|short} {desc}"
@ 6:6ec71c037d94 added x @ 6:6ec71c037d94 added x
| |
| % 5:36b793615f78 added foo to c | % 5:36b793615f78 added foo to c
| | | |
| | o 4:863a25e1a9ea added x | | o 4:863a25e1a9ea added x
| |/ | |/
$ hg graft -r 8 -r 7 -r 5 $ hg graft -r 8 -r 7 -r 5
grafting 8:637f9e9bbfd4 "added z" (tip) grafting 8:637f9e9bbfd4 "added z" (tip)
grafting 7:123221671fd4 "added y" grafting 7:123221671fd4 "added y"
grafting 5:36b793615f78 "added foo to c" grafting 5:36b793615f78 "added foo to c"
merging c merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark') warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ cd .. $ cd ..
$ hg init pullrepo $ hg init pullrepo
$ cd pullrepo $ cd pullrepo
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [phases] > [phases]
> publish=False > publish=False
> EOF > EOF
$ hg graft 3 --no-commit $ hg graft 3 --no-commit
grafting 3:09e253b87e17 "A in file a" grafting 3:09e253b87e17 "A in file a"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Resolve conflict: Resolve conflict:
$ echo A>a $ echo A>a
$ hg resolve --mark $ hg resolve --mark
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
Check --no-commit is resepected when passed with --continue: Check --no-commit is resepected when passed with --continue:
$ hg graft 3 $ hg graft 3
grafting 3:09e253b87e17 "A in file a" grafting 3:09e253b87e17 "A in file a"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Resolve conflict: Resolve conflict:
$ echo A>a $ echo A>a
$ hg resolve --mark $ hg resolve --mark
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue --no-commit $ hg graft --continue --no-commit
When there is conflict: When there is conflict:
$ hg graft -r "2::3" --no-commit $ hg graft -r "2::3" --no-commit
grafting 2:d36c0562f908 "c" grafting 2:d36c0562f908 "c"
grafting 3:09e253b87e17 "A in file a" grafting 3:09e253b87e17 "A in file a"
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ echo A>a $ echo A>a
$ hg resolve --mark $ hg resolve --mark
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 3:09e253b87e17 "A in file a" grafting 3:09e253b87e17 "A in file a"
$ hg diff $ hg diff

tests/test-graft.t

merging e merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
e: versions differ -> m (merge) e: versions differ -> m (merge)
picked tool ':merge' for e (binary False symlink False changedelete False) picked tool ':merge' for e (binary False symlink False changedelete False)
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Summary should mention graft: Summary should mention graft:
$ hg summary |grep graft $ hg summary |grep graft
commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
Using status to get more context Using status to get more context
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e) skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e)
skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec) skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
grafting 4:9c233e8e184d "4" grafting 4:9c233e8e184d "4"
merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
Continue without resolve should fail: Continue without resolve should fail:
$ hg graft -c $ hg graft -c
grafting 4:9c233e8e184d "4" grafting 4:9c233e8e184d "4"
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [255]
$ hg ci -m 8 $ hg ci -m 8
created new head created new head
$ echo c > a $ echo c > a
$ hg ci -m 9 $ hg ci -m 9
$ hg graft 1 --tool internal:fail $ hg graft 1 --tool internal:fail
grafting 1:5d205f8b35b6 "1" grafting 1:5d205f8b35b6 "1"
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg resolve --all $ hg resolve --all
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1] [1]
$ cat a $ cat a
<<<<<<< local: aaa4406d4f0a - test: 9 <<<<<<< local: aaa4406d4f0a - test: 9
c c
======= =======
Resolve conflicted graft with rename Resolve conflicted graft with rename
$ echo c > a $ echo c > a
$ hg ci -m 10 $ hg ci -m 10
$ hg graft 2 --tool internal:fail $ hg graft 2 --tool internal:fail
grafting 2:5c095ad7e90f "2" grafting 2:5c095ad7e90f "2"
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg resolve --all $ hg resolve --all
merging a and b to b merging a and b to b
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft -c $ hg graft -c
grafting 2:5c095ad7e90f "2" grafting 2:5c095ad7e90f "2"
$ hg export tip --git $ hg export tip --git
# HG changeset patch # HG changeset patch
graft --continue after --force graft --continue after --force
$ echo def > a $ echo def > a
$ hg ci -m 27 $ hg ci -m 27
$ hg graft 24 --force --tool internal:fail $ hg graft 24 --force --tool internal:fail
grafting 24:2e7ea477be26 "24" grafting 24:2e7ea477be26 "24"
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ hg resolve --all $ hg resolve --all
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1] [1]
$ echo abc > a $ echo abc > a
$ hg resolve -m a $ hg resolve -m a
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue

tests/test-issue1175.t

$ echo b2 >> b $ echo b2 >> b
$ hg ci -Aqm b2 $ hg ci -Aqm b2
$ hg graft 1 $ hg graft 1
grafting 1:5974126fad84 "b1" grafting 1:5974126fad84 "b1"
merging b merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [1]
$ echo a > b $ echo a > b
$ echo b3 >> b $ echo b3 >> b
$ hg resolve --mark b $ hg resolve --mark b
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:5974126fad84 "b1" grafting 1:5974126fad84 "b1"
$ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'