Mercurial > hg

annotate tests/test-issue619.out @ 6219:d43c94414ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix test results missed by 6218:345a23eca8f6
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Fri, 07 Mar 2008 08:38:07 +0100
parents 8808ea7da86b
children cdc458b12f0f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4748
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 adding a
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 marked working directory as branch b
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 adding b
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 fast-forward
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 (branch merge, don't forget to commit)
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 bogus fast-forward should fail
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
8808ea7da86b merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 done