https://bz.mercurial-scm.org/show_bug.cgi?id=6527
Bug ID: 6527
Summary: Incorrect error message shown when aborting a merge
with an ongoing bisect operation
Product: Mercurial
Version: stable branch
Hardware: Other
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: tom.ingelbi...@nokia.com
CC: mercurial-devel@mercurial-scm.org
Python Version: ---
Since version 5.1.2-1, Mercurial gives an incorrect error message when aborting
a merge while a bisect is still ongoing (admittedly quite a corner case).
I'm working on CentOS, where I can easily reproduce it with following minimized
scenario:
# Set up a small repo
hg init
echo "lorem ipsum" > textfile; hg add textfile; hg commit -m "First commit"
echo "dolor sit amet" >> textfile; hg commit -m "Second commit"
# Create second head
hg up -r 0
echo "foo" > bar; hg add bar
hg commit -m "Additional head for merging"
# Run a bisect (without explicitly resetting at the end)
hg bisect --reset
hg bisect --bad 1
hg bisect --good 0
# Initiate a merge, and abort it
hg merge
hg merge --abort
# Result: following incorrect error message
# abort: cannot abort merge with bisect in progress
# (use 'hg bisect --continue' or 'hg bisect --abort')
The bisect command doesn't recognize either of those two suggested options,
though. Note that I only target this incorrect help text in this bug ticket.
The decision to refuse aborting a merge with a bisect operation in progress is
not what I'm challenging here.
I didn't see the issue on versions older than 5.1.2-1, but _only_ because those
happily aborted the merge, despite the bisect still being in progress. Since
there's no error message, there's also no incorrect hint. I've verified this on
4.5-1, 4.6-1, 4.7.1-1 and 4.9-1.
As I could resolve the situation by just running "hg bisect --reset" again, it
seems that this is actually the hint that should be displayed (rather than the
--continue and --abort options).
--
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
