view tests/test-debugrename @ 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 ci -Am t

hg mv a b
hg ci -Am t1
hg debugrename b

hg mv b a
hg ci -Am t2
hg debugrename a

echo % test with --rev
hg debugrename --rev 1 b