[Bug 3667] New: commit during graft conflict creates a merge

[bugzilla-daemon at bz.selenic.com]

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

          Priority: normal
            Bug ID: 3667
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: commit during graft conflict creates a merge
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: mpm at selenic.com
          Hardware: All
            Status: UNCONFIRMED
           Version: 2.3.2
         Component: Mercurial
           Product: Mercurial

If you do a graft that stops for conflict resolution, the working dir has two
parents. Committing the result rather than 'graft -c' thus creates an
undesirable merge.

Ideally, graft would leave the working directory in a state where commit
generates an ok commit (despite losing the original changeset's metadata).
This turns out to be complicated, because the resolve command needs to see the
second parent to do its job.

Alternately, commit should refuse to work if a graft's in progress. This would
probably require adding an --abort flag to back out of a graft.

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