view tests/test-bheads.out @ 10505:b3311e26f94f stable

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().

0: Adding root node ()
-------
0: Adding root node ()
=======
marked working directory as branch a
1: Adding a branch (a)
0: Adding root node ()
-------
1: Adding a branch (a)
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
created new head
2: Adding b branch (b)
1: Adding a branch (a)
0: Adding root node ()
-------
2: Adding b branch (b)
=======
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
3: Adding b branch head 1 (b)
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
5: Adding b branch head 3 (b)
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
5: Adding b branch head 3 (b)
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
=======
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
=======
marked working directory as branch c
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
7: Adding c branch (c)
=======
no open branch heads found on branches c (started at 3)
1
-------
7: Adding c branch (c)
0
-------
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0
-------
3: Adding b branch head 1 (b)
0
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
0
-------
no open branch heads found on branches b (started at 7)
1
=======
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
0: Adding root node ()
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
1: Adding a branch (a)
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
-------
7: Adding c branch (c)
-------
=======
1: Adding a branch (a)
-------
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
-------
7: Adding c branch (c)
-------
abort: unknown revision 'z'!
-------
=======
7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
% topological heads
7: Adding c branch (c)
3: Adding b branch head 1 (b)
1: Adding a branch (a)