[Rivet] HG transition

[David Grellscheid]

Hi Frank,

diff on a merge changeset is misleading. You need to be explicit which 
of the two parents you are comparing to. Looking at trac/log, your merge 
looks fine.

In your situation, you could also have used the 'rebase' command. It 
needs to be enabled explicitly in ~/.hgrc:

[extensions]
rebase =
color =

It allows you to move your single dangling checkin to the top of the 
tree as long as you have not yet pushed it:

hg ci -m'my local stuff'
# 3 weeks pass
hg pull
# oops, lots of stuff came in
hg heads
# shows two heads
hg rebase # (uses the merge machinery internally)
hg heads
# shows one head again, with my changeset on top

   David