[Bug 4185] New: 'hg evolve --continue' after 'hg evolve --all' only finishes evolving one changeset

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Feb 28 17:48:47 CST 2014


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

          Priority: normal
            Bug ID: 4185
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: 'hg evolve --continue' after 'hg evolve --all' only
                    finishes evolving one changeset
          Severity: bug
    Classification: Unclassified
                OS: All
          Reporter: zeratul976 at hotmail.com
          Hardware: All
            Status: UNCONFIRMED
           Version: unspecified
         Component: evolution
           Product: Mercurial

Steps to reproduce:

  1. Perform a history-altering operation (e.g. commit --amend)
     such that multiple changesets are obsoleted by it and
     evolving one of them (not the last) will cause a merge
     conflict.

  2. Perform an 'hg evolve --all'. It will run into the
     merge conflict.

  3. Resolve the merge conflict and run 'hg evolve --continue'.

Expected results:

  'hg evolve --continue' continues evolving all remaining
  obsolete changesets.

Actual results:

  'hg evolve --continue' continues evolving the single
  changeset which had the merge conflict, and then stops.

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


More information about the Mercurial-devel mailing list