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-issue436
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 3749 f9567a7fa3b3
permissions -rwxr-xr-x
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3745
68cddfbbe737 add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     1
 
#!/bin/sh
68cddfbbe737 add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset 
     2
 












68cddfbbe737
add test for issue436



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




     3


hg init a













68cddfbbe737
add test for issue436



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




     4


cd a








3749






f9567a7fa3b3
additional fixes for issue436



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3745

diff
changeset




     5


hg -v log -v








3745






68cddfbbe737
add test for issue436



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




     6


hg -v log -v x













68cddfbbe737
add test for issue436



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 

diff
changeset




     7


true















Mercurial