merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
#!/bin/sh
hg init
echo a > a
hg ci -Am t
hg mv a b
hg ci -Am t1
hg debugrename b
hg mv b a
hg ci -Am t2
hg debugrename a
echo % test with --rev
hg debugrename --rev 1 b