Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue619.out
author Brendan Cully <brendan@kublai.com>
Wed, 01 Aug 2007 11:37:11 -0700
changeset 5044 58006f8b8275
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
imerge extension and test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
Mercurial