Mercurial > hg
view tests/test-merge-default @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | 50b6af595e0c |
children | 6d36fc70754e |
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 -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