view tests/test-revlog-ancestry.py.out @ 45916:fa87536d3d70

errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents a60dae060bc8
children
line wrap: on
line source

Ancestors of 5
4 2 0 
Ancestors of 6 and 5
4 3 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 4 3 2 1 0 
Ancestors of 7, 5 and 3, including revs
7 6 5 4 3 2 1 0 

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