view tests/test-merge-remove.out @ 11609:890ad9d6a169

log: slowpath: do not read the full changelog When in the slowpath, we are examining _all_ changesets in revs. We need to order reads so they happen increasingly for I/O performance. Increasing windows were used to read changelog backwards in a windowed manner, reading the changelog forward inside each window. But since no revision range was specified, it was equivalent to reading the full changelog, even if a single revision was passed to the commandline. When --removed is used, we _need_ to scan all changesets, but if we're only looking for file patterns, this is not necessary and we can stick to the revspec that was given to us.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun, 04 Jul 2010 18:07:30 +0900
parents 369ddc9c0339
children
line wrap: on
line source

created new head
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r   0         -2 bar
r   0         -1 foo1
copy: foo -> foo1
R bar
R foo1
% readding foo1 and bar
adding bar
adding foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo
% reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo