[Bug 6138] New: `hg next --merge` (--evolve on by default) complains about dirty working copy
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Tue May 14 19:14:01 UTC 2019
https://bz.mercurial-scm.org/show_bug.cgi?id=6138
Bug ID: 6138
Summary: `hg next --merge` (--evolve on by default) complains
about dirty working copy
Product: Mercurial
Version: 4.7.2
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzilla at mercurial-scm.org
Reporter: martinvonz at google.com
CC: mercurial-devel at mercurial-scm.org,
pierre-yves.david at ens-lyon.org
`hg next --merge` is supposed to move any dirty working copy changes along to
the next commit. Now that `hg next` has --evolve on by default, it will first
try to evolve an orphan. But the evolve step requires a clean working copy, so
you end up with "abort: uncommitted changes", which is really confusing when
you specified "--merge".
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list