https://bz.mercurial-scm.org/show_bug.cgi?id=6669
Bug ID: 6669
Summary: evolve --dry-run updates wdir if on an obsolete commit
Product: Mercurial
Version: 6.1
Hardware: All
OS: Windows
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: matt_harbi...@yahoo.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Python Version: ---
I hit this after running `hg fixup -r s1`:
$ hg fixup -r s1
2 new orphan changesets
$ hg evolve -n
update:[6576] prometheus: split the generic adapter alerts out of the NVMe
alert rules
move:[s2] prometheus: add alerts for exporters not running
atop:[s1] prometheus: split the generic adapter alerts out of the NVMe alert
rules
hg rebase -r 94a461b03583 -d f69a57b751e9
skipping 61fa36ed1678, consider including orphan ancestors
working directory is now at f69a57b751e9
It's also easy to reproduce by amending a commit with a child, updating to the
predecessor of the amended commit, and then running `hg evolve -n`. (Both
cases have a topic, if that matters.)
--
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
