cannot redo 3-way merge by "hg resolve" if graft interrupted

Yuya Nishihara yuya at tcha.org
Wed Jun 13 10:57:55 CDT 2012


Hi,

(following the discussion of thg-dev
 https://groups.google.com/d/msg/thg-dev/OPLrmnqHIpk/lEY9DEeoYswJ)

If "hg graft" fails with conflicts, it says "use hg resolve":

% hg graft 3 --tool internal:merge 
grafting revision 3
merging foo
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use hg resolve and hg graft --continue)

but in such case, the working directory does not have two parents,
"hg resolve" does nothing:

% hg resolve --all

% hg resolve -l
U foo

only "hg resolve -m" works.

Is this an expected behavior or a bug?

Regards,


More information about the Mercurial-devel mailing list