author | Thomas Arendsen Hein <thomas@intevation.de> |
Wed, 22 Nov 2006 22:33:57 +0100 | |
changeset 3706 | 0d810798acb1 |
parent 2915 | 013921c753bd |
child 5242 | 9cd6578750b9 |
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 hg commit -mm2 echo % should fail because 1 head hg merge true