Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
#!/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