tests/test-merge10

log: remove increasing windows usage in fastpath

The purpose of increasing windows is to allow backwards iteration on the
filelog  at a reasonable cost.
But is it needed?
 - if follow is False, we have no reason to iterate backwards.
   We basically just want to walk the complete filelog and yield all revisions
   within the revision range. We can do this forward or
   backwards, as it only reads the index.
 - when follow is True, we need to examine the contents of the filelog, and to
   do this efficiently we need to read the filelog forward.
   And on the other hand, to track ancestors and copies, we need to process
   revisions backwards. But is it necessary to use increasing windows
   for this?
   We can iterate over the complete filelog forward, stack the revisions, and
   read the reversed(pile), it does the same thing with a more readable code.

#!/bin/sh

# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
# (merge correctly when all the files in a directory are moved
# but then local changes are added in the same directory)

hg init a
cd a
mkdir -p testdir
echo a > testdir/a
hg add testdir/a
hg commit -d '1000000 0' -m a
cd ..

hg clone a b
cd a
echo alpha > testdir/a
hg commit -d '1000000 0' -m remote-change
cd ..

cd b
mkdir testdir/subdir
hg mv testdir/a testdir/subdir/a
hg commit -d '1000000 0' -m move
mkdir newdir
echo beta > newdir/beta
hg add newdir/beta
hg commit -d '1000000 0' -m local-addition
hg pull ../a
hg up -C 2
hg merge
hg stat
hg diff --nodates