view tests/test-revlog-ancestry.py.out @ 21552:61151f429a5f

update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 19 May 2014 01:53:34 +0200
parents f88c60e740a1
children b6db2e80a9ce
line wrap: on
line source

Ancestors of 5
4 2 0 
Ancestors of 6 and 5
3 4 2 1 0 
Ancestors of 5 and 4
4 2 0 
Ancestors of 7, stop at 6
6 
Ancestors of 7, including revs
7 6 5 3 4 2 1 0 
Ancestors of 7, 5 and 3, including revs
7 5 3 6 4 2 1 0 

Descendants of 5
7 8 
Descendants of 5 and 3
6 7 8 
Descendants of 5 and 4
5 7 8