view tests/test-hup @ 10251:a19d2993385d stable

subrepo: fix merging of already merged subrepos (issue1986)

This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.

In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.

Test provided by Steve Losh.

#!/bin/sh

"$TESTDIR/hghave" fifo || exit 80

hg init
mkfifo p

hg serve --stdio < p &
P=$!
(echo lock; echo addchangegroup; sleep 5) > p &
Q=$!
sleep 3
kill -HUP $P
wait
echo .hg/* .hg/store/*