author | Martin Geisler <mg@lazybytes.net> |
Fri, 19 Jun 2009 10:30:18 +0200 | |
changeset 8910 | 0c610f77ae1a |
parent 8387 | 50b6af595e0c |
child 8834 | 6d36fc70754e |
permissions | -rwxr-xr-x |
#!/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 -S 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