Mercurial Mercurial > hg-stable / 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 Jim Hague <jim.hague@acm.org>
Sun, 25 Nov 2007 11:49:34 +0100
changeset 5547 777996744942
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
patch: fix sort() comparator argument 'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and 'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.
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
hg-stable