Mercurial > hg > gitweb
view tests/test-merge-default @ 4430:94cb7561337d
Fix test-patchbomb for crew
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 08 May 2007 13:08:20 -0700 |
parents | 013921c753bd |
children |
line wrap: on
line source
#!/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