view tests/test-revert-unknown @ 6521:a3668330f14a

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:20:58 +0300
parents 890e285c52a1
children
line wrap: on
line source

#!/bin/sh

hg init
touch unknown

touch a
hg add a
hg ci -m "1" -d "1000000 0"

touch b
hg add b
hg ci -m "2" -d "1000000 0"

echo %% Should show unknown
hg status
hg revert -r 0 --all
echo %% Should show unknown and b removed
hg status
echo %% Should show a and unknown
ls