Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue619 @ 4904:59b8ff35c4ed
patch: patches should be read and written in binary mode when possible.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 17 Jul 2007 23:35:24 +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