Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
4747:452d171a1b39 | 4748:8808ea7da86b |
---|---|
1 adding a | |
2 marked working directory as branch b | |
3 adding b | |
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
5 fast-forward | |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 (branch merge, don't forget to commit) | |
8 bogus fast-forward should fail | |
9 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' | |
10 done |