How can I get the changeset ID of the base file when merging with mercurial?

Question

I have a couple branches that I need to merge, but I don't know where some of the changes are coming from that are showing up in my merge tool. The change sets of local and other are obvious, but how can I find out which change set the base file came from? I'm working in a repository with dozens of branches, so viewing the graph and tracking it doesn't work very well.

Answer 1

Using revsets (Mercurial 1.6 and later), you can get the common ancestor of two changesets with:

hg log -r ancestor(rev1,rev2)