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

hg init
echo a > a
hg add a
hg commit -m "1" -d "1000000 0"
hg status
hg copy a b
hg status
hg --debug commit -m "2" -d "1000000 0"
echo "we should see two history entries"
hg history -v
echo "we should see one log entry for a"
hg log a
echo "this should show a revision linked to changeset 0"
hg debugindex .hg/store/data/a.i
echo "we should see one log entry for b"
hg log b
echo "this should show a revision linked to changeset 1"
hg debugindex .hg/store/data/b.i

echo "this should show the rename information in the metadata"
hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2

$TESTDIR/md5sum.py .hg/store/data/b.i
hg cat b > bsum
$TESTDIR/md5sum.py bsum
hg cat a > asum
$TESTDIR/md5sum.py asum
hg verify