view tests/test-merge8 @ 10185:7637fe4f525d stable

mq: preserve --git flag when merging patches

Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update