view tests/test-confused-revert @ 2511:041d8f0a8437

mq: hg qnew -f should refresh the new patch

qnew -f was originally meant to just skip the localchanges check.
But, it currently discards the local changes, which is not at all what
people expect.

This patch changes qnew -f to create the new patch and then
run hg qrefresh on it.  The local changes will be in the new
patch.

#!/bin/sh

hg init
echo foo > a
hg add a
hg commit -m "1" -d "1000000 0"

echo bar > b
hg add b
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "reverting..."
hg revert

echo "%%% should show b unknown and a back to normal"
hg status

rm b

hg co -C 0
echo foo-a > a
hg commit -m "2a" -d "1000000 0"

hg co -C 0
echo foo-b > a
hg commit -m "2b" -d "1000000 0"

HGMERGE=true hg merge 1

echo "%%% should show foo-b"
cat a

echo bar > b
hg add b
rm a
hg remove a

echo "%%% should show a removed and b added"
hg status

echo "%%% revert should fail"
hg revert

echo "%%% revert should be ok now"
hg revert -r2

echo "%%% should show b unknown and a marked modified (merged)"
hg status

echo "%%% should show foo-b"
cat a