view tests/test-export @ 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 repo
cd repo
touch foo
hg add foo
for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
    echo "foo-$i" >> foo
    hg ci -m "foo-$i"
done

for out in "%nof%N" "%%%H" "%b-%R" "%h" "%r"; do
    echo "# foo-$out.patch"
    hg export -v -o "foo-$out.patch" 2:tip
done

echo "# exporting 4 changesets to a file"
hg export -o export_internal 1 2 3 4
grep HG export_internal | wc -l | sed -e 's/^ *//'
echo "# exporting 4 changesets to a file"
hg export 1 2 3 4 | grep HG | wc -l | sed -e 's/^ *//'
echo "# exporting revision -2 to a file"
hg export -- -2