Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619 @ 5415:1d53a75ea0fc
convert: do not output when trying to load svn bindings
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 07 Oct 2007 20:45:10 +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