view tests/test-locate.out @ 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.

adding a
adding b
adding dir.h/foo
adding t.h
adding t/b
adding t/e.h
adding t/x
hg locate a
a

locate succeeded
hg locate NONEXISTENT

locate failed
hg locate 
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x

hg locate a

hg locate NONEXISTENT

hg locate relpath:NONEXISTENT

hg locate 
b
dir.h/foo
t.h
t/b
t/e.h
t/x

hg locate -r 0 a
a

hg locate -r 0 NONEXISTENT

hg locate -r 0 relpath:NONEXISTENT

hg locate -r 0
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x

% -I/-X with relative path should work
hg locate 
b
dir.h/foo
t.h
t/b
t/e.h
t/x

hg locate -I ../t
t/b
t/e.h
t/x

hg locate t/**
t/b
t/e.h
t/x

hg locate b
../b
../t/b

hg locate *.h
../t.h
../t/e.h

hg locate path:t/x
../t/x

hg locate re:.*\.h$
../t.h
../t/e.h

hg locate -r 0 b
../b
../t/b

hg locate -r 0 *.h
../t.h
../t/e.h

hg locate -r 0 path:t/x
../t/x

hg locate -r 0 re:.*\.h$
../t.h
../t/e.h