view tests/test-rollback @ 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 88b4d726332a
children 720f70b720d3
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m "test" -d "1000000 0"
hg verify
hg parents
hg status
hg rollback
hg verify
hg parents
hg status

echo % Test issue 902
hg commit -m "test"
hg branch test
hg rollback
hg branch

echo % Test rollback of hg before issue 902 was fixed
hg commit -m "test"
hg branch test
rm .hg/undo.branch
hg rollback
hg branch