hg log 'filename' not showing merges?

[Matt Mackall]

On Mon, May 21, 2007 at 02:57:59PM +0200, Lars Marowsky-Bree wrote:
> 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?

Probably. If there wasn't an actual three-way merge in the merge
changeset, then there wasn't a file-level change for that changeset.

-- 
Mathematics is the supreme nostalgia of our time.