https://bz.mercurial-scm.org/show_bug.cgi?id=5786
Bug ID: 5786
Summary: `hg evolve --continue` crashes if working directory
clean
Product: Mercurial
Version: 4.4-rc
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: martinv...@google.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
$ 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)
[255]
$ 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
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
