Mercurial > hg
diff tests/test-issue619.out @ 4748:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 05 Jul 2007 13:34:18 -0500 |
| parents | |
| children | cdc458b12f0f |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue619.out Thu Jul 05 13:34:18 2007 -0500 @@ -0,0 +1,10 @@ +adding a +marked working directory as branch b +adding b +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +fast-forward +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) +bogus fast-forward should fail +abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' +done