Tracking down branching ancestry in revision control is horrible to say least. At least git has a nice little feature which lets you change the log output into a nicer layout.
git log --graph
To look at a specific revision:
git log --graph commitid
This will give a nice branched log format to help you track down commits.