Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619 @ 5310:ba3dc7883968
debuginstall: stop looking for patch utility, just test it
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 15 Sep 2007 16:07:05 +0200 |
parents | 8808ea7da86b |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg ci -Ama -d '1000000000 0' echo b > b hg branch b hg ci -Amb -d '1000000000 0' hg co -C 0 echo fast-forward hg merge b hg ci -Ammerge -d '1000000000 0' echo bogus fast-forward should fail hg merge b echo done