##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-config-case: print only the Section we're interested in....
test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.
Benoit Boissinot - - Load All Authors

File last commit:

r3592:fffc8a73 default
r4528:85a69f4d default
Show More
test-merge5
20 lines | 439 B | text/plain | TextLexer
/ tests / test-merge5
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -m "commit #0" -d "1000000 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "1000000 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "1000000 0"
# in theory, we shouldn't need the "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1
exit 0