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-revlog-ancestry.py.out
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 6872 c7cc40fd74f6
child 16868 eb88ed4269c5
permissions -rw-r--r--
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:
6872
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     1
 
Ancestors of 5
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 
4 2 0
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     3
 
Ancestors of 6 and 5
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     4
 
3 4 2 1 0
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     5
 
Ancestors of 5 and 4
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     6
 
4 2 0
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     7
 












c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     8


Descendants of 5













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     9


7 8 













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    10


Descendants of 5 and 3













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    11


6 7 8 













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    12


Descendants of 5 and 4













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    13


5 7 8















Mercurial