Mercurial > hg
view tests/test-issue619 @ 7534:5aca12729a0d
keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 16 Dec 2008 09:58:41 +0100 |
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