rebase: allow for rebasing descendants onto ancestors on different named branches
So far we've been denying rebasing descendants onto ancestors, but there are
situations in which this kind of operation makes perfect sense to me.
Let's say we have made a commit (or more), that belongs to branch 'dev', on
top of the named branch 'stable':
... a (stable) - b (dev)
but then we realize that b should belong to branch 'stable'.
In these cases a rebase means: "move these csets from named branch A to named
branch B" and there isn't a valid reason to deny it.
This patch basically doesn't block it, if source and destination are
on different named branches.
The old behaviour still applies for rebases across the same named branch.
Can you think of any tricky corner cases in which this new behaviour could
lead to problems? (I bet there are tons of them...)
By the way, I created a brand new .t because I feel there should be more
tests I can't think of at the moment.
#!/usr/bin/env python
#
# Wrapper script around the convert.py hgext extension
# for foreign SCM conversion to mercurial format.
#
import sys
from mercurial import ui, fancyopts
from hgext import convert
# Options extracted from the cmdtable
func, options, help = convert.cmdtable['convert']
# An ui instance
u = ui.ui()
opts = {}
args = []
try:
args = list(fancyopts.fancyopts(sys.argv[1:], options, opts))
args += [None]*(3 - len(args))
src, dest, revmapfile = args
except (fancyopts.getopt.GetoptError, ValueError), inst:
u.warn('Usage:\n%s\n' % help)
sys.exit(-1)
convert.convert(u, src, dest, revmapfile, **opts)