Mercurial > hg-stable
comparison tests/test-convert-cvs-branch.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.
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 15 Jan 2010 21:08:04 +0100 |
| parents | 56a5f80556f5 |
| children |
comparison
equal
deleted
inserted
replaced
| 10249:8ebb34b0f6f7 | 10251:a19d2993385d |
|---|