Mercurial > hg
comparison tests/test-ancestor.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 | 3b1b8f25443e |
children | b6db2e80a9ce |
comparison
equal
deleted
inserted
replaced
24327:f7c0556d22d7 | 24328:603a8d09e12d |
---|