##// END OF EJS Templates
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j

File last commit:

r4748:8808ea7d default
r6246:35bf9c23 default
Show More
test-issue619
20 lines | 257 B | text/plain | TextLexer
#!/bin/sh
mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0
echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'
echo bogus fast-forward should fail
hg merge b
echo done