view tests/test-debugrename @ 11353:f2b25e8ea6c1

merge: when current branch has 1 or > 2 heads, actually abort.

Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.

#!/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