mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
21 lines
257 B
Plaintext
21 lines
257 B
Plaintext
|
#!/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
|