Merge commits do only show files changed during the merge as changed (i.e. those with conflicts or similar). Bug or feature?

jens.lund at nordea.com jens.lund at nordea.com
Tue Dec 2 08:26:02 UTC 2008


> From: Dirkjan Ochtman [mailto:dirkjan at ochtman.nl] 
> Sent: 29 November 2008 16:53
> jens.lund at nordea.com wrote:
> > I am in doubt about what I would propose as the correct 
> behaviour for
> > the log, but I definitely find the behaviour for hgk/hgtk log
> > misleading.
> 
> Benoit Boissinot has been kicking around "merge diffs", that can 
> somewhat-intuitively show diffs for merge changesets...

I will be looking out for this.

> What hg's core is saying for the merge changeset is 
> effectively "there 
> are no new file revisions in this changeset", which is often correct 

That makes sense, and that is the reason I think the hg log behaviour is
fine. However still, I would expect the diff shown in the log browsers
to show the same diff I would get if I make an explicit diff from the
command line.

Just realised that clicking on revisions in hgtk log and chose "visual
diff with selected" will actually show all the diffs, so that is a great
help.

Thanks for your help,
Jens





More information about the Mercurial mailing list