view tests/test-pull @ 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

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m 1
hg verify
hg serve -p $HGPORT -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
cd ..

hg clone --pull http://localhost:$HGPORT/ copy | sed -e 's,:[0-9][0-9]*/,/,'
cd copy
hg verify
hg co
cat foo
hg manifest --debug
hg pull | sed -e 's,:[0-9][0-9]*/,/,'

echo % issue 622
cd ..
hg init empty
cd empty
hg pull -u ../test

echo % test file: uri handling
hg pull -q file://../test-doesnt-exist
hg pull -q file:../test
hg pull -q file://foobar`pwd`/../test