Mercurial > hg
view tests/test-issue619 @ 5024:7963438881f5
convert: empty log messages are OK as of 7f5c3fb0a37d
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 27 Jul 2007 14:30:20 -0700 |
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