mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
46 lines
504 B
Bash
Executable File
46 lines
504 B
Bash
Executable File
#!/bin/sh
|
|
|
|
hg init
|
|
echo a > a
|
|
hg commit -A -ma
|
|
|
|
echo a >> a
|
|
hg commit -mb
|
|
|
|
echo a >> a
|
|
hg commit -mc
|
|
|
|
hg up 1
|
|
echo a >> a
|
|
hg commit -md
|
|
|
|
hg up 1
|
|
echo a >> a
|
|
hg commit -me
|
|
|
|
hg up 1
|
|
echo % should fail because not at a head
|
|
hg merge
|
|
|
|
hg up
|
|
echo % should fail because \> 2 heads
|
|
hg merge
|
|
|
|
echo % should succeed
|
|
hg merge 2
|
|
hg commit -mm1
|
|
|
|
echo % should succeed - 2 heads
|
|
hg merge -P
|
|
hg merge
|
|
hg commit -mm2
|
|
|
|
echo % should fail because at tip
|
|
hg merge
|
|
|
|
hg up 0
|
|
echo % should fail because 1 head
|
|
hg merge
|
|
|
|
true
|