Mercurial > hg
diff tests/test-issue619 @ 4815:5cc184800bf2
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 15:36:56 -0500 |
parents | 8808ea7da86b |
children | 4c94b6d0fb1c |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue619 Thu Jul 05 15:36:56 2007 -0500 @@ -0,0 +1,20 @@ +#!/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