[Bug 4873] New: summary command does not list graft state
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Oct 2 02:59:30 UTC 2015
https://bz.mercurial-scm.org/show_bug.cgi?id=4873
Bug ID: 4873
Summary: summary command does not list graft state
Product: Mercurial
Version: 3.5.1
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzilla at selenic.com
Reporter: cdelahousse at fb.com
CC: mercurial-devel at selenic.com
Summary command does not notify the user when graft is stuck in a merge
conflict.
After trying to graft a commit onto another and having merge conflicts, if the
user decides to delay the conflict resolution process and run the `summary`
command, they should see a listing stating that the repo is in a graft state.
Steps to reproduce:
1) Graft one commit onto another that will cause merge conflicts
2) When prompted to deal with the conflicts (eg. a text editor appears), quit
and do not resolve them.
3) Run `hg summary`
Expected results:
You should see if you're a graft state
Actual results:
Aside from the normal output, you aren't informed that you're in a graft state
with a merge conflict.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list