Mercurial > hg
view tests/test-issue619 @ 6083:81a8667331e8
convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 12 Feb 2008 23:35:35 +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