view tests/test-confused-revert @ 7429:dbc40381620e

tests: Skip tests if they will fail because of outer repo For different reasons these tests will fail if run in a tmpdir which is in a hg repo. The following three tests assumes no .hg in path dirs - I don't know how to work around that: * test-dispatch explicitly tests for no repo and expects "abort: There is no Mercurial repository here (.hg not found)!" * test-extension expects parentui to be None when not cd'ed to a repo dir * test-globalopts tests that implicit -R works correctly - that could perhaps be done from another repo instead of assuming no repo The following two might be worth investigating further: * test-convert-svn-sink fails for unknown reasons, starting with "abort: unresolved merge conflicts (see hg resolve)" * test-glog gets strange failures when testing "from outer space"
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 27 Nov 2008 00:57:31 +0100
parents 890e285c52a1
children 4c94b6d0fb1c
line wrap: on
line source

#!/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 --all

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 --all

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

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

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