Mercurial > hg
view tests/test-doctest.py @ 13033:026053f691a4
mq: add an '-e/--exact' option to qpush
This patch adds an '--exact/-e' option to qpush that will try to push the
patches in the correct location in the DAG. Specifying this option does the
following:
* If --move is specified, abort. It makes no sense to move a patch to the front
of the queue and try to apply it to its parent, because its parent is one of
the patches we just moved it in front of!
* If patches are already applied, abort. We don't want patch changesets
scattered throughout the DAG.
* If local changes are present, abort unless --force is used, as usual.
* Find the first patch we're going to push (if we're pushing multiple patches
with a target or --all).
* If that patch doesn't have a parent, abort, obviously.
* If the parent doesn't exist in the repo, abort. Something is wrong.
* Update to the parent, then continue pushing the patches as normal.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Wed, 17 Nov 2010 21:18:44 -0500 |
parents | 0f83a402faa0 |
children | 7cc4263e07a9 5d0a30fad7de |
line wrap: on
line source
# 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 doctest.testmod(mercurial.changelog) import mercurial.dagparser doctest.testmod(mercurial.dagparser, optionflags=doctest.NORMALIZE_WHITESPACE) import mercurial.match doctest.testmod(mercurial.match) import mercurial.url doctest.testmod(mercurial.url) import hgext.convert.cvsps doctest.testmod(hgext.convert.cvsps)