Mercurial > hg
view tests/test-revlog-ancestry.py.out @ 24328:603a8d09e12d
convert: adjust progress bar for octopus merges (issue4169)
For merges, we walk the files N-1 times, where N is the number of
parents. This means that for an octopus merge with 3 parents and 2
changed files, we actually fetch 6 files. This corrects the progress
output of the convert command when such commits are encountered.
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 12 Mar 2015 21:41:50 -0400 |
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