[Python-Dev] Commit changelog: issue number and merges

[Stephen J. Turnbull]

R. David Murray writes:
 > On Mon, 09 May 2011 18:23:45 -0500, Benjamin Peterson <benjamin at python.org> wrote:

 > > *cough* http://mercurial.selenic.com/wiki/GraphlogExtension
 > 
 > I'm sorry, but I've looked at the output of that and the mental overhead
 > has so far proven too high for it to be of any use to me.

How about the hgk extension, and "hg view"?

http://mercurial.selenic.com/wiki/HgkExtension

 > But as I think about this, frankly I'd rather see atomic commits, even
 > on merges.  That was something I disliked about svnmerge, the fact that
 > often an svnmerge commit involved many changesets from the other branch.
 > That was especially painful in exactly the same situation:  trying to
 > backtrack a change starting from 'svn blame'.

I don't understand the issue.  In my experience, hg annotate will
point to the commit on the branch, not to the merge, unless there was
a conflict, in which case the merge is the "right" place (although not
necessarily the most useful place) to point.