view tests/test-issue619 @ 10186:296a0b14a686 stable 1.4.2

mq: preserve --git flag when folding patches

Without this, folding a git patch into a regular one downgrades the resulting
patch to a regular patch.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done