hg log 'filename' not showing merges?

Lars Marowsky-Bree lmb at suse.de
Mon May 21 07:57:59 CDT 2007


Hi all,

I'm a bit surprised by hg log 'filename' not showing merges.

We use hg for the Linux HA project; the repository in question is
http://hg.linux-ha.org/dev. (My client is using 0.9.3.)

In da3a73d1d6d4, changes were made to lrm/lrmd/lrmd.c. It was pulled and
merged into a different workspace by Alan in cc868e409675. (That merge,
accidentially, reverted the changes to lrmd.c, but not the others.)

They were merged and pushed to our dev repo again in d2639cbc3351. From
this point on, the "dev" repo has backed out those changes as well.

Further changes to lrmd.c were made in other changesets.

Now, that all works as expected, and the merge reversing the changes is
a clear pilot error.

But, "hg log -p lrm/lrmd/lrmd.c" does not show cc868e409675 as part of
the file's history, so it wasn't exactly obvious to spot the changeset
which had screwed up.

Is this expected behaviour?

It seems the filename-filtered hg log doesn't show merges; I think it
should at least show merges which modified the result. But, maybe my
explanation isn't correct.


Thanks,
    Lars

-- 
Teamlead Kernel, SuSE Labs, Research and Development
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
"Experience is the name everyone gives to their mistakes." -- Oscar Wilde



More information about the Mercurial mailing list