view tests/test-hgweb-filelog @ 8742:a964ab624385

merge: allow merging going backwards

New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.

case 1: update to .

a-w -> a-w

classic: ancestor a
 missing     recreated     right?
 rmed        recreated     WRONG
 added       forgotten     WRONG
 changed     preserved     RIGHT
 conflicted  can't happen

backward merge: ancestor a  (NO EFFECT)
 missing     missing      wrong?
 rm'ed       rm'ed        RIGHT
 added       preserved	  RIGHT
 changed     preserved    RIGHT
 conflicted  can't happen

case 2: update to ancestor of .

a-b-w -> b-w
          \
           a

classic:  ancestor a
 missing       recreated        right?
 rmed          recreated        wrong?
 added         forgotten        wrong?
 changed       preserved        RIGHT
 conflicted    preserved        wrong?

backwards merge: ancestor b
 missing       missing or conflict  right?
 rm'ed         missing or conflict  right?
 changed       preserved            RIGHT
 conflicted    merge                RIGHT
 added         preserved            right?

#!/bin/sh

hg init test
cd test

echo b > b
hg ci -Am "b"

echo a > a
hg ci -Am "first a"

hg rm a
hg ci -m "del a"

echo b > a
hg ci -Am "second a"

hg rm a
hg ci -m "del2 a"

hg mv b c
hg ci -m "mv b"

echo c >> c
hg ci -m "change c"

hg log -p

hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
cat hg.pid >> $DAEMON_PIDS

echo % tip - two revisions
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/tip/a')

echo % second version - two revisions
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/3/a')

echo % first deleted - one revision
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/2/a')

echo % first version - one revision
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/1/a')

echo % before addition - error
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/0/a')

echo % should show base link, use spartan because it shows it
("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log/tip/c?style=spartan')

echo % errors
cat errors.log