[Bug 3800] New: "hg sum" shows graft as merge

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Sat Feb 2 11:00:56 CST 2013


http://bz.selenic.com/show_bug.cgi?id=3800

          Priority: normal
            Bug ID: 3800
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: "hg sum" shows graft as merge
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: pitrou at free.fr
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.5-rc
         Component: Mercurial
           Product: Mercurial

This is what "hg sum" shows after a graft was left incomplete (because of
conflicts):

$ hg sum
parent: 81943:e6952acd5a55 
 Back out fix for issue #13886; it introduced a new bug in interactive readline
use.
parent: 81949:8dcf94c2fef5 tip
 Issue #15633: httplib.HTTPResponse is now mark closed when the server sends
less than the advertised Content-Length.
branch: 3.2
commit: 3 modified (merge)
update: (current)


I guess the "commit" line should show "(graft)" at the end instead of
"(merge)".

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list