[Bug 5105] New: `hg histedit` does not print which changeset is currently in conflict
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Wed Feb 17 22:37:12 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5105
Bug ID: 5105
Summary: `hg histedit` does not print which changeset is
currently in conflict
Product: Mercurial
Version: default branch
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: histedit
Assignee: bugzilla at selenic.com
Reporter: gregory.szorc at gmail.com
CC: mercurial-devel at selenic.com
$ hg histedit
merging testing/taskcluster/tasks/branches/base_jobs.yml
warning: conflicts while merging
testing/taskcluster/tasks/branches/base_jobs.yml! (edit, then use 'hg resolve
--mark')
Fix up the change (pick e501c30434c8)
(hg histedit --continue to resume)
I have no clue what changeset I'm currently on. This makes resolving the
conflict difficult.
`hg rebase` by contrast prints a changeset summary so I know which changeset
I'm on.
This /might/ be a "regression" due to recent changes to make histedit's output
less verbose.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list