Bug ID: 5786
           Summary: `hg evolve --continue` crashes if working directory
           Product: Mercurial
           Version: 4.4-rc
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: evolution

$ hg init repo
  $ cd repo
  $ echo a > f
  $ hg ci -Aqm a
  $ echo b > f
  $ hg ci -m b
  $ hg prev -q
  $ echo a2 > f
  $ hg amend
  1 new orphan changesets
  $ hg evolve -q
  warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
  evolve failed!
  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
  abort: unresolved merge conflicts (see hg help resolve)
  $ hg revert f
  $ hg resolve -m
  (no more unresolved files)
  $ hg evolve -c 2>&1 | grep TypeError
  TypeError: object of type 'NoneType' has no len()

This is because localrepo.commit() returns None on empty commit (unless empty
is allowed).

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

Reply via email to