[Bug 3498] New: graft: cannot redo 3-way merge by "hg resolve" if graft interrupted

[bugzilla-daemon at bz.selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3498

          Priority: normal
            Bug ID: 3498
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: graft: cannot redo 3-way merge by "hg resolve" if
                    graft interrupted
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: yuya at tcha.org
          Hardware: All
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

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,
so "hg resolve" does nothing:

% hg resolve --all

% hg resolve -l
U foo

only "hg resolve -m" works.


I guess "resolve" need to handle graft failure differently than merge's,
because graft needs to trick common ancestor:

http://selenic.com/repo/hg/file/2255950e1f76/mercurial/commands.py#l2744

-- 
You are receiving this mail because:
You are on the CC list for the bug.