| commit | 3f6ee2d15ab4be8690c17c0af0338b8495f6f706 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 14 Jan 2007 05:28:58 +0000 (14 00:28 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 14 Jan 2007 20:20:39 +0000 (14 12:20 -0800) | ||
| tree | 896f8c3a056ab5608d0db694e87e69c1162ee34b | treesnapshot (tar.gz zip) |
| parent | 66a155bc129b12f1f13be8e3f20e57db5ace0e6f | commitdiff |
Display a progress meter during merge-recursive.
Because large merges on slow systems can take up to a minute to
execute we should try to keep the user entertained with a progress
meter to let them know how far we have progressed through the
current merge.
The progress meter considers each entry in the in-memory index to
be a unit, which means a single recursive merge will double the
number of units in the progress meter. Files which are unmerged
after the 3-way tree merge are also considered a unit within the
progress meter.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Because large merges on slow systems can take up to a minute to
execute we should try to keep the user entertained with a progress
meter to let them know how far we have progressed through the
current merge.
The progress meter considers each entry in the in-memory index to
be a unit, which means a single recursive merge will double the
number of units in the progress meter. Files which are unmerged
after the 3-way tree merge are also considered a unit within the
progress meter.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |