Mercurial > hg
view tests/test-issue619 @ 9241:d98cef25b5af
Merge with crew-stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 24 Jul 2009 15:28:29 +0200 |
parents | 8808ea7da86b |
children | 4c94b6d0fb1c |
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