changeset 13158 | 9e7e24052745 |
parent 12346 | 3b165c127690 |
child 13550 | 1792b8a9422b |
--- a/tests/test-issue619.t Wed Dec 08 22:14:18 2010 -0600 +++ b/tests/test-issue619.t Tue Dec 07 03:29:21 2010 +0100 @@ -19,7 +19,12 @@ $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + $ hg branch + default + $ hg parent --template '{rev}:{node|short} {branches}: {desc}\n' + 1:06c2121185be b: b $ hg ci -Ammerge + created new head Bogus fast-forward should fail: