[Bug 5805] New: Amend doesn't check for outstanding merge conflicts
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Sun Feb 25 06:03:41 UTC 2018
https://bz.mercurial-scm.org/show_bug.cgi?id=5805
Bug ID: 5805
Summary: Amend doesn't check for outstanding merge conflicts
Product: Mercurial
Version: 4.4.2
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: normal
Component: Mercurial
Assignee: bugzilla at mercurial-scm.org
Reporter: matt_harbison at yahoo.com
CC: mercurial-devel at mercurial-scm.org
I tweaked some code and ran a test a couple of revisions prior to the tip,
accepting the changes. I then did an update, but bailed on resolving the test
conflicts because there were too many, and simply reran the test. I totally
forgot about the unmerged state until I tried updating elsewhere. But in the
meantime, it let me (evolve) amend, and `hg ci --amend` (with evolve disabled).
The working directory is clean (and summary agrees, though it notes one
unresolved file, as does `hg resolve --list`). Vanilla commit and update are
both blocked.
I can see a selective amend (-I/-X/path) after an update being useful even if
there are unresolved files, as long as the selected ones aren't unresolved.
But allowing an unresolved file to be amended feels like a bug. If not, it
should probably clear the unresolved state.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list