view tests/test-doctest.py @ 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.

# this is hack to make sure no escape characters are inserted into the output
import os;
if 'TERM' in os.environ:
    del os.environ['TERM']
import doctest

import mercurial.changelog
# test doctest from changelog

doctest.testmod(mercurial.changelog)

import mercurial.httprepo
doctest.testmod(mercurial.httprepo)

import mercurial.util
doctest.testmod(mercurial.util)

import hgext.convert.cvsps
doctest.testmod(hgext.convert.cvsps)