merge commits and file log history question

[Jan Heylen]

Hi,

we have a long history of merges, and while trying to find back where
a certain line was changed, I noticed following behaviour:

* D
|
* C (Merge
|\
| * B
|
* A

so A and B are normal commits, C is the merge.

Say, in B a line is added in <file>, while in A that line is not
present in <file>.

Now in D, we see the line is not there (so the merge was done with
taking the version in A.

If I do:

hg log -pr C
I get the full content of the diff in 'C' , and I see indeed the line
is 'removed' in comparison to 'B'

but when I do hg log -pr C <file>
I get no output, as if that <file> wasn't touched.

I would like to understand this difference, and if there is way to do
hg log -p <file>, where the changes done in merge commits are shown.


br,

Jan Heylen