This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9914

errors: use more specific errors in rebase extension
ClosedPublic

Authored by martinvonz on Jan 29 2021, 7:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9989a276712f: errors: use more specific errors in rebase extension

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 29 2021, 7:37 PM
pulkit added a subscriber: pulkit.Jan 31 2021, 1:20 PM

I think some of them should be StateError. To be honest, I am unable to draw a clear line between InputError and StateError. What do you think?

hgext/rebase.py
147

maybe StateError instead?

1464

Should be StateError instead?

1664

Should be StateError instead?

martinvonz marked 3 inline comments as done.Feb 3 2021, 12:59 PM
martinvonz updated this revision to Diff 25476.
martinvonz added a comment.Feb 3 2021, 12:59 PM
In D9914#150319, @pulkit wrote:

I think some of them should be StateError. To be honest, I am unable to draw a clear line between InputError and StateError. What do you think?

I also don't really know the difference. It doesn't matter which I pick for Google's purposes anyway (we just want to filter out errors that are not caused by bugs). I doubt it would matter to others either. Therefore, I don't spend much time picking the right one and I'm happy to switch to whatever my reviewers prefer :)

martinvonz added a commit: rHG9989a276712f: errors: use more specific errors in rebase extension.Mar 4 2021, 7:39 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9989a276712f: errors: use more specific errors in rebase extension (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25380

hgext/rebase.py

src = revset.getset(repo, subset, x).first() src = revset.getset(repo, subset, x).first()
# Empty src or already obsoleted - Do not return a destination # Empty src or already obsoleted - Do not return a destination
if not src or src in obsoleted: if not src or src in obsoleted:
return smartset.baseset() return smartset.baseset()
dests = destutil.orphanpossibledestination(repo, src) dests = destutil.orphanpossibledestination(repo, src)
if len(dests) > 1: if len(dests) > 1:
raise error.Abort( raise error.InputError(
pulkitUnsubmitted
Done

maybe StateError instead?

pulkit: maybe StateError instead?
_(b"ambiguous automatic rebase: %r could end up on any of %r") _(b"ambiguous automatic rebase: %r could end up on any of %r")
% (src, dests) % (src, dests)
) )
# We have zero or one destination, so we can just return here. # We have zero or one destination, so we can just return here.
return smartset.baseset(dests) return smartset.baseset(dests)
def _ctxdesc(ctx): def _ctxdesc(ctx):
# Empty state built, nothing to rebase # Empty state built, nothing to rebase
self.ui.status(_(b'nothing to rebase\n')) self.ui.status(_(b'nothing to rebase\n'))
return _nothingtorebase() return _nothingtorebase()
(self.originalwd, self.destmap, self.state) = result (self.originalwd, self.destmap, self.state) = result
if self.collapsef: if self.collapsef:
dests = set(self.destmap.values()) dests = set(self.destmap.values())
if len(dests) != 1: if len(dests) != 1:
raise error.Abort( raise error.InputError(
_(b'--collapse does not work with multiple destinations') _(b'--collapse does not work with multiple destinations')
) )
destrev = next(iter(dests)) destrev = next(iter(dests))
destancestors = self.repo.changelog.ancestors( destancestors = self.repo.changelog.ancestors(
[destrev], inclusive=True [destrev], inclusive=True
) )
self.external = externalparent(self.repo, self.state, destancestors) self.external = externalparent(self.repo, self.state, destancestors)
# there's a user-provided extrafn it can clobber branch if # there's a user-provided extrafn it can clobber branch if
# desired # desired
self.extrafns.insert(0, _savebranch) self.extrafns.insert(0, _savebranch)
if self.collapsef: if self.collapsef:
branches = set() branches = set()
for rev in self.state: for rev in self.state:
branches.add(repo[rev].branch()) branches.add(repo[rev].branch())
if len(branches) > 1: if len(branches) > 1:
raise error.Abort( raise error.InputError(
_(b'cannot collapse multiple named branches') _(b'cannot collapse multiple named branches')
) )
# Calculate self.obsoletenotrebased # Calculate self.obsoletenotrebased
obsrevs = _filterobsoleterevs(self.repo, self.state) obsrevs = _filterobsoleterevs(self.repo, self.state)
self._handleskippingobsolete(obsrevs, self.destmap) self._handleskippingobsolete(obsrevs, self.destmap)
# Keep track of the active bookmarks in order to reset them later # Keep track of the active bookmarks in order to reset them later
if opts.get(b'dry_run') or opts.get(b'confirm'): if opts.get(b'dry_run') or opts.get(b'confirm'):
return _dryrunrebase(ui, repo, action, opts) return _dryrunrebase(ui, repo, action, opts)
elif action == b'stop': elif action == b'stop':
rbsrt = rebaseruntime(repo, ui) rbsrt = rebaseruntime(repo, ui)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
rbsrt.restorestatus() rbsrt.restorestatus()
if rbsrt.collapsef: if rbsrt.collapsef:
raise error.Abort(_(b"cannot stop in --collapse session")) raise error.StateError(_(b"cannot stop in --collapse session"))
allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
if not (rbsrt.keepf or allowunstable): if not (rbsrt.keepf or allowunstable):
raise error.Abort( raise error.StateError(
_( _(
b"cannot remove original changesets with" b"cannot remove original changesets with"
b" unrebased descendants" b" unrebased descendants"
), ),
hint=_( hint=_(
b'either enable obsmarkers to allow unstable ' b'either enable obsmarkers to allow unstable '
b'revisions or use --keep to keep original ' b'revisions or use --keep to keep original '
b'changesets' b'changesets'
help = b"hg%s help -e histedit" % enablehistedit help = b"hg%s help -e histedit" % enablehistedit
msg = ( msg = (
_( _(
b"interactive history editing is supported by the " b"interactive history editing is supported by the "
b"'histedit' extension (see \"%s\")" b"'histedit' extension (see \"%s\")"
) )
% help % help
) )
raise error.Abort(msg) raise error.InputError(msg)
if rbsrt.collapsemsg and not rbsrt.collapsef: if rbsrt.collapsemsg and not rbsrt.collapsef:
raise error.Abort(_(b'message can only be specified with collapse')) raise error.InputError(
_(b'message can only be specified with collapse')
)
if action: if action:
if rbsrt.collapsef: if rbsrt.collapsef:
raise error.Abort( raise error.InputError(
_(b'cannot use collapse with continue or abort') _(b'cannot use collapse with continue or abort')
) )
if action == b'abort' and opts.get(b'tool', False): if action == b'abort' and opts.get(b'tool', False):
ui.warn(_(b'tool option will be ignored\n')) ui.warn(_(b'tool option will be ignored\n'))
if action == b'continue': if action == b'continue':
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
# destspace is here to work around issues with `hg pull --rebase` see # destspace is here to work around issues with `hg pull --rebase` see
# issue5214 for details # issue5214 for details
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
if not inmemory: if not inmemory:
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if ui.configbool(b'commands', b'rebase.requiredest') and not destf: if ui.configbool(b'commands', b'rebase.requiredest') and not destf:
raise error.Abort( raise error.InputError(
_(b'you must specify a destination'), _(b'you must specify a destination'),
hint=_(b'use: hg rebase -d REV'), hint=_(b'use: hg rebase -d REV'),
) )
dest = None dest = None
if revf: if revf:
rebaseset = scmutil.revrange(repo, revf) rebaseset = scmutil.revrange(repo, revf)
else: # can it happen? else: # can it happen?
ui.status( ui.status(
_(b'nothing to rebase from %s to %s\n') _(b'nothing to rebase from %s to %s\n')
% (b'+'.join(bytes(repo[r]) for r in base), dest) % (b'+'.join(bytes(repo[r]) for r in base), dest)
) )
return None return None
if wdirrev in rebaseset: if wdirrev in rebaseset:
raise error.Abort(_(b'cannot rebase the working copy')) raise error.InputError(_(b'cannot rebase the working copy'))
rebasingwcp = repo[b'.'].rev() in rebaseset rebasingwcp = repo[b'.'].rev() in rebaseset
ui.log( ui.log(
b"rebase", b"rebase",
b"rebasing working copy parent: %r\n", b"rebasing working copy parent: %r\n",
rebasingwcp, rebasingwcp,
rebase_rebasing_wcp=rebasingwcp, rebase_rebasing_wcp=rebasingwcp,
) )
if inmemory and rebasingwcp: if inmemory and rebasingwcp:
# don't want to abort if destset is empty. # don't want to abort if destset is empty.
destset = repo.anyrevs([destf], user=True, localalias=alias) destset = repo.anyrevs([destf], user=True, localalias=alias)
size = len(destset) size = len(destset)
if size == 1: if size == 1:
destmap[r] = destset.first() destmap[r] = destset.first()
elif size == 0: elif size == 0:
ui.note(_(b'skipping %s - empty destination\n') % repo[r]) ui.note(_(b'skipping %s - empty destination\n') % repo[r])
else: else:
raise error.Abort( raise error.InputError(
_(b'rebase destination for %s is not unique') % repo[r] _(b'rebase destination for %s is not unique') % repo[r]
) )
if dest is not None: if dest is not None:
# single-dest case: assign dest to each rev in rebaseset # single-dest case: assign dest to each rev in rebaseset
destrev = dest.rev() destrev = dest.rev()
destmap = {r: destrev for r in rebaseset} # {srcrev: destrev} destmap = {r: destrev for r in rebaseset} # {srcrev: destrev}
continue continue
for p in repo[rev].parents(): for p in repo[rev].parents():
if p.rev() not in state and p.rev() not in destancestors: if p.rev() not in state and p.rev() not in destancestors:
parents.add(p.rev()) parents.add(p.rev())
if not parents: if not parents:
return nullrev return nullrev
if len(parents) == 1: if len(parents) == 1:
return parents.pop() return parents.pop()
raise error.Abort( raise error.InputError(
pulkitUnsubmitted
Done

Should be StateError instead?

pulkit: Should be StateError instead?
_( _(
b'unable to collapse on top of %d, there is more ' b'unable to collapse on top of %d, there is more '
b'than one external parent: %s' b'than one external parent: %s'
) )
% (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents))) % (max(destancestors), b', '.join(b"%d" % p for p in sorted(parents)))
) )
if divergencebasecandidates and not divergenceok: if divergencebasecandidates and not divergenceok:
divhashes = (bytes(repo[r]) for r in divergencebasecandidates) divhashes = (bytes(repo[r]) for r in divergencebasecandidates)
msg = _(b"this rebase will cause divergences from: %s") msg = _(b"this rebase will cause divergences from: %s")
h = _( h = _(
b"to force the rebase please set " b"to force the rebase please set "
b"experimental.evolution.allowdivergence=True" b"experimental.evolution.allowdivergence=True"
) )
raise error.Abort(msg % (b",".join(divhashes),), hint=h) raise error.InputError(msg % (b",".join(divhashes),), hint=h)
pulkitUnsubmitted
Done

Should be StateError instead?

pulkit: Should be StateError instead?
def successorrevs(unfi, rev): def successorrevs(unfi, rev):
"""yield revision numbers for successors of rev""" """yield revision numbers for successors of rev"""
assert unfi.filtername is None assert unfi.filtername is None
get_rev = unfi.changelog.index.get_rev get_rev = unfi.changelog.index.get_rev
for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]): for s in obsutil.allsuccessors(unfi.obsstore, [unfi[rev].node()]):
r = get_rev(s) r = get_rev(s)
# No parent change might be an error because we fail to make rev a # No parent change might be an error because we fail to make rev a
# descendent of requested dest. This can happen, for example: # descendent of requested dest. This can happen, for example:
# #
# C # rebase -r C -d D # C # rebase -r C -d D
# /| # None of A and B will be changed to D and rebase fails. # /| # None of A and B will be changed to D and rebase fails.
# A B D # A B D
if set(newps) == set(oldps) and dest not in newps: if set(newps) == set(oldps) and dest not in newps:
raise error.Abort( raise error.InputError(
_( _(
b'cannot rebase %d:%s without ' b'cannot rebase %d:%s without '
b'moving at least one of its parents' b'moving at least one of its parents'
) )
% (rev, repo[rev]) % (rev, repo[rev])
) )
# Source should not be ancestor of dest. The check here guarantees it's # Source should not be ancestor of dest. The check here guarantees it's
# impossible. With multi-dest, the initial check does not cover complex # impossible. With multi-dest, the initial check does not cover complex
# cases since we don't have abstractions to dry-run rebase cheaply. # cases since we don't have abstractions to dry-run rebase cheaply.
if any(p != nullrev and isancestor(rev, p) for p in newps): if any(p != nullrev and isancestor(rev, p) for p in newps):
raise error.Abort(_(b'source is ancestor of destination')) raise error.InputError(_(b'source is ancestor of destination'))
# Check if the merge will contain unwanted changes. That may happen if # Check if the merge will contain unwanted changes. That may happen if
# there are multiple special (non-changelog ancestor) merge bases, which # there are multiple special (non-changelog ancestor) merge bases, which
# cannot be handled well by the 3-way merge algorithm. For example: # cannot be handled well by the 3-way merge algorithm. For example:
# #
# F # F
# /| # /|
# D E # "rebase -r D+E+F -d Z", when rebasing F, if "D" was chosen # D E # "rebase -r D+E+F -d Z", when rebasing F, if "D" was chosen
if l > 0: if l > 0:
unwanteddesc = _(b' or ').join( unwanteddesc = _(b' or ').join(
( (
b', '.join(b'%d:%s' % (r, repo[r]) for r in revs) b', '.join(b'%d:%s' % (r, repo[r]) for r in revs)
for revs in unwanted for revs in unwanted
if revs is not None if revs is not None
) )
) )
raise error.Abort( raise error.InputError(
_(b'rebasing %d:%s will include unwanted changes from %s') _(b'rebasing %d:%s will include unwanted changes from %s')
% (rev, repo[rev], unwanteddesc) % (rev, repo[rev], unwanteddesc)
) )
# newps[0] should match merge base if possible. Currently, if newps[i] # newps[0] should match merge base if possible. Currently, if newps[i]
# is nullrev, the only case is newps[i] and newps[j] (j < i), one is # is nullrev, the only case is newps[i] and newps[j] (j < i), one is
# the other's ancestor. In that case, it's fine to not swap newps here. # the other's ancestor. In that case, it's fine to not swap newps here.
# (see CASE-1 and CASE-2 above) # (see CASE-1 and CASE-2 above)
srcset = set(destmap) srcset = set(destmap)
while srcset: while srcset:
srclist = sorted(srcset) srclist = sorted(srcset)
result = [] result = []
for r in srclist: for r in srclist:
if destmap[r] not in srcset: if destmap[r] not in srcset:
result.append(r) result.append(r)
if not result: if not result:
raise error.Abort(_(b'source and destination form a cycle')) raise error.InputError(_(b'source and destination form a cycle'))
srcset -= set(result) srcset -= set(result)
yield result yield result
def buildstate(repo, destmap, collapse): def buildstate(repo, destmap, collapse):
"""Define which revisions are going to be rebased and where """Define which revisions are going to be rebased and where
repo: repo repo: repo
destmap: {srcrev: destrev} destmap: {srcrev: destrev}
""" """
rebaseset = destmap.keys() rebaseset = destmap.keys()
originalwd = repo[b'.'].rev() originalwd = repo[b'.'].rev()
# This check isn't strictly necessary, since mq detects commits over an # This check isn't strictly necessary, since mq detects commits over an
# applied patch. But it prevents messing up the working directory when # applied patch. But it prevents messing up the working directory when
# a partially completed rebase is blocked by mq. # a partially completed rebase is blocked by mq.
if b'qtip' in repo.tags(): if b'qtip' in repo.tags():
mqapplied = {repo[s.node].rev() for s in repo.mq.applied} mqapplied = {repo[s.node].rev() for s in repo.mq.applied}
if set(destmap.values()) & mqapplied: if set(destmap.values()) & mqapplied:
raise error.Abort(_(b'cannot rebase onto an applied mq patch')) raise error.StateError(_(b'cannot rebase onto an applied mq patch'))
# Get "cycle" error early by exhausting the generator. # Get "cycle" error early by exhausting the generator.
sortedsrc = list(sortsource(destmap)) # a list of sorted revs sortedsrc = list(sortsource(destmap)) # a list of sorted revs
if not sortedsrc: if not sortedsrc:
raise error.Abort(_(b'no matching revisions')) raise error.InputError(_(b'no matching revisions'))
# Only check the first batch of revisions to rebase not depending on other # Only check the first batch of revisions to rebase not depending on other
# rebaseset. This means "source is ancestor of destination" for the second # rebaseset. This means "source is ancestor of destination" for the second
# (and following) batches of revisions are not checked here. We rely on # (and following) batches of revisions are not checked here. We rely on
# "defineparents" to do that check. # "defineparents" to do that check.
roots = list(repo.set(b'roots(%ld)', sortedsrc[0])) roots = list(repo.set(b'roots(%ld)', sortedsrc[0]))
if not roots: if not roots:
raise error.Abort(_(b'no matching revisions')) raise error.InputError(_(b'no matching revisions'))
def revof(r): def revof(r):
return r.rev() return r.rev()
roots = sorted(roots, key=revof) roots = sorted(roots, key=revof)
state = dict.fromkeys(rebaseset, revtodo) state = dict.fromkeys(rebaseset, revtodo)
emptyrebase = len(sortedsrc) == 1 emptyrebase = len(sortedsrc) == 1
for root in roots: for root in roots:
dest = repo[destmap[root.rev()]] dest = repo[destmap[root.rev()]]
commonbase = root.ancestor(dest) commonbase = root.ancestor(dest)
if commonbase == root: if commonbase == root:
raise error.Abort(_(b'source is ancestor of destination')) raise error.InputError(_(b'source is ancestor of destination'))
if commonbase == dest: if commonbase == dest:
wctx = repo[None] wctx = repo[None]
if dest == wctx.p1(): if dest == wctx.p1():
# when rebasing to '.', it will use the current wd branch name # when rebasing to '.', it will use the current wd branch name
samebranch = root.branch() == wctx.branch() samebranch = root.branch() == wctx.branch()
else: else:
samebranch = root.branch() == dest.branch() samebranch = root.branch() == dest.branch()
if not collapse and samebranch and dest in root.parents(): if not collapse and samebranch and dest in root.parents():
def pullrebase(orig, ui, repo, *args, **opts): def pullrebase(orig, ui, repo, *args, **opts):
"""Call rebase after pull if the latter has been invoked with --rebase""" """Call rebase after pull if the latter has been invoked with --rebase"""
if opts.get('rebase'): if opts.get('rebase'):
if ui.configbool(b'commands', b'rebase.requiredest'): if ui.configbool(b'commands', b'rebase.requiredest'):
msg = _(b'rebase destination required by configuration') msg = _(b'rebase destination required by configuration')
hint = _(b'use hg pull followed by hg rebase -d DEST') hint = _(b'use hg pull followed by hg rebase -d DEST')
raise error.Abort(msg, hint=hint) raise error.InputError(msg, hint=hint)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
if opts.get('update'): if opts.get('update'):
del opts['update'] del opts['update']
ui.debug( ui.debug(
b'--update and --rebase are not compatible, ignoring ' b'--update and --rebase are not compatible, ignoring '
b'the update flag\n' b'the update flag\n'
) )
ui.status(_(b'nothing to rebase\n')) ui.status(_(b'nothing to rebase\n'))
else: else:
ui.status(_(b'nothing to rebase - updating instead\n')) ui.status(_(b'nothing to rebase - updating instead\n'))
# not passing argument to get the bare update behavior # not passing argument to get the bare update behavior
# with warning and trumpets # with warning and trumpets
commands.update(ui, repo) commands.update(ui, repo)
else: else:
if opts.get('tool'): if opts.get('tool'):
raise error.Abort(_(b'--tool can only be used with --rebase')) raise error.InputError(_(b'--tool can only be used with --rebase'))
ret = orig(ui, repo, *args, **opts) ret = orig(ui, repo, *args, **opts)
return ret return ret
def _filterobsoleterevs(repo, revs): def _filterobsoleterevs(repo, revs):
"""returns a set of the obsolete revisions in revs""" """returns a set of the obsolete revisions in revs"""
return {r for r in revs if repo[r].obsolete()} return {r for r in revs if repo[r].obsolete()}

tests/test-rebase-collapse.t

> D B > D B
> |/ > |/
> A > A
> EOF > EOF
$ hg rebase --base B -m 'custom message' $ hg rebase --base B -m 'custom message'
abort: message can only be specified with collapse abort: message can only be specified with collapse
[255] [10]
$ cat > $TESTTMP/checkeditform.sh <<EOF $ cat > $TESTTMP/checkeditform.sh <<EOF
> env | grep HGEDITFORM > env | grep HGEDITFORM
> true > true
> EOF > EOF
$ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
rebasing 3:26805aba1e60 C tip "C" rebasing 3:26805aba1e60 C tip "C"
> |\| > |\|
> H C B > H C B
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase -s C --dest H --collapse $ hg rebase -s C --dest H --collapse
abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 abort: unable to collapse on top of 3, there is more than one external parent: 1, 6
[255] [10]
Rebase and collapse - E onto H: Rebase and collapse - E onto H:
$ hg rebase -s E --dest H --collapse # root (E) is not a merge $ hg rebase -s E --dest H --collapse # root (E) is not a merge
rebasing 5:49cb92066bfd E "E" rebasing 5:49cb92066bfd E "E"
rebasing 6:11abe3fb10b8 F "F" rebasing 6:11abe3fb10b8 F "F"
rebasing 7:64e264db77f0 G tip "G" rebasing 7:64e264db77f0 G tip "G"
saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg
> B G > B G
> |/ > |/
> A > A
> EOF > EOF
BROKEN: should be allowed BROKEN: should be allowed
$ hg rebase --collapse -r 'B+D+F' -d G $ hg rebase --collapse -r 'B+D+F' -d G
abort: unable to collapse on top of 2, there is more than one external parent: 3, 5 abort: unable to collapse on top of 2, there is more than one external parent: 3, 5
[255] [10]
$ cd .. $ cd ..
$ hg init multiple-external-parents-2 $ hg init multiple-external-parents-2
$ cd multiple-external-parents-2 $ cd multiple-external-parents-2
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
> D G > D G
> |\ /| > |\ /|
> B C E F > B C E F
> \| |/ > \| |/
> \ H / > \ H /
> \|/ > \|/
> A > A
> EOF > EOF
$ hg rebase --collapse -d H -s 'B+F' $ hg rebase --collapse -d H -s 'B+F'
abort: unable to collapse on top of 5, there is more than one external parent: 1, 3 abort: unable to collapse on top of 5, there is more than one external parent: 1, 3
[255] [10]
$ cd .. $ cd ..
With internal merge: With internal merge:
$ hg init internal-merge $ hg init internal-merge
$ cd internal-merge $ cd internal-merge
$ hg debugdrawdag << 'EOF' $ hg debugdrawdag << 'EOF'
| o 2: 8ac4a08debf1 'C' two | o 2: 8ac4a08debf1 'C' two
| | | |
| o 1: 1ba175478953 'B' one | o 1: 1ba175478953 'B' one
|/ |/
o 0: 1994f17a630e 'A' o 0: 1994f17a630e 'A'
$ hg rebase --keepbranches --collapse -s 1 -d 3 $ hg rebase --keepbranches --collapse -s 1 -d 3
abort: cannot collapse multiple named branches abort: cannot collapse multiple named branches
[255] [10]
$ cd .. $ cd ..
Rebase, collapse and copies Rebase, collapse and copies
$ hg init copies $ hg init copies
$ cd copies $ cd copies
$ hg unbundle "$TESTDIR/bundles/renames.hg" $ hg unbundle "$TESTDIR/bundles/renames.hg"

tests/test-rebase-dest.t

$ hg commit -qAm bb $ hg commit -qAm bb
$ hg up ".^" $ hg up ".^"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c >> c $ echo c >> c
$ hg commit -qAm cc $ hg commit -qAm cc
$ hg rebase $ hg rebase
abort: you must specify a destination abort: you must specify a destination
(use: hg rebase -d REV) (use: hg rebase -d REV)
[255] [10]
$ hg rebase -d 1 $ hg rebase -d 1
rebasing 2:5db65b93a12b tip "cc" rebasing 2:5db65b93a12b tip "cc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-rebase.hg
$ hg rebase -d 0 -r . -q $ hg rebase -d 0 -r . -q
$ HGPLAIN=1 hg rebase $ HGPLAIN=1 hg rebase
rebasing 2:889b0bc6a730 tip "cc" rebasing 2:889b0bc6a730 tip "cc"
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-rebase.hg
$ hg rebase -d 0 -r . -q $ hg rebase -d 0 -r . -q
$ hg commit -qAm ee $ hg commit -qAm ee
$ cd .. $ cd ..
$ cd clone $ cd clone
$ echo f > f $ echo f > f
$ hg commit -qAm ff $ hg commit -qAm ff
$ hg pull --rebase $ hg pull --rebase
abort: rebase destination required by configuration abort: rebase destination required by configuration
(use hg pull followed by hg rebase -d DEST) (use hg pull followed by hg rebase -d DEST)
[255] [10]
Setup rebase with multiple destinations Setup rebase with multiple destinations
$ cd $TESTTMP $ cd $TESTTMP
$ cat >> $TESTTMP/maprevset.py <<EOF $ cat >> $TESTTMP/maprevset.py <<EOF
> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial import registrar, revset, revsetlang, smartset > from mercurial import registrar, revset, revsetlang, smartset
$ rebasewithdag -s C+E -d 'SRC^^' --collapse <<'EOS' $ rebasewithdag -s C+E -d 'SRC^^' --collapse <<'EOS'
> C F > C F
> | | > | |
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
abort: --collapse does not work with multiple destinations abort: --collapse does not work with multiple destinations
[255] [10]
Multiple destinations cannot be used with --base: Multiple destinations cannot be used with --base:
$ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS' $ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS'
> B E > B E
> | | > | |
> A D > A D
> EOS > EOS
$ rebasewithdag -s B -d 'ALLSRC+SRC' <<'EOS' $ rebasewithdag -s B -d 'ALLSRC+SRC' <<'EOS'
> C > C
> | > |
> B > B
> | > |
> Z > Z
> EOS > EOS
abort: rebase destination for f0a671a46792 is not unique abort: rebase destination for f0a671a46792 is not unique
[255] [10]
Destination is an ancestor of source: Destination is an ancestor of source:
$ rebasewithdag -s B -d 'SRC' <<'EOS' $ rebasewithdag -s B -d 'SRC' <<'EOS'
> C > C
> | > |
> B > B
> | > |
> Z > Z
> EOS > EOS
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [10]
BUG: cycles aren't flagged correctly when --dry-run is set: BUG: cycles aren't flagged correctly when --dry-run is set:
$ rebasewithdag -s B -d 'SRC' --dry-run <<'EOS' $ rebasewithdag -s B -d 'SRC' --dry-run <<'EOS'
> C > C
> | > |
> B > B
> | > |
> Z > Z
> EOS > EOS
abort: source and destination form a cycle abort: source and destination form a cycle
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
[255] [10]
Switch roots: Switch roots:
$ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS' $ rebasewithdag -s 'all() - roots(all())' -d 'roots(all()) - ::SRC' <<'EOS'
> C F > C F
> | | > | |
> B E > B E
> | | > | |
$ rebasewithdag -r 'all()-Z' -d 'map(SRC, "A:B,B:C,C:D,D:B")' <<'EOS' $ rebasewithdag -r 'all()-Z' -d 'map(SRC, "A:B,B:C,C:D,D:B")' <<'EOS'
> A B C > A B C
> \|/ > \|/
> | D > | D
> |/ > |/
> Z > Z
> EOS > EOS
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [10]
Detect source is ancestor of dest in runtime: Detect source is ancestor of dest in runtime:
$ rebasewithdag -r 'C+B' -d 'map(SRC, "C:B,B:D")' -q <<'EOS' $ rebasewithdag -r 'C+B' -d 'map(SRC, "C:B,B:D")' -q <<'EOS'
> D > D
> | > |
> B C > B C
> \| > \|
> A > A
> EOS > EOS
abort: source is ancestor of destination abort: source is ancestor of destination
[255] [10]
"Already rebased" fast path still works: "Already rebased" fast path still works:
$ rebasewithdag -r 'all()' -d 'SRC^' <<'EOS' $ rebasewithdag -r 'all()' -d 'SRC^' <<'EOS'
> E F > E F
> /| | > /| |
> B C D > B C D
> \|/ > \|/

tests/test-rebase-mq.t

|/ |/
o 0: 36f36ddbca61 'C1' tags: qparent o 0: 36f36ddbca61 'C1' tags: qparent
Rebase - try to rebase on an applied mq patch: Rebase - try to rebase on an applied mq patch:
$ hg rebase -s 1 -d 3 $ hg rebase -s 1 -d 3
abort: cannot rebase onto an applied mq patch abort: cannot rebase onto an applied mq patch
[255] [20]
Rebase - same thing, but mq patch is default dest: Rebase - same thing, but mq patch is default dest:
$ hg up -q 1 $ hg up -q 1
$ hg rebase $ hg rebase
abort: cannot rebase onto an applied mq patch abort: cannot rebase onto an applied mq patch
[255] [20]
$ hg up -q qtip $ hg up -q qtip
Rebase - generate a conflict: Rebase - generate a conflict:
$ hg rebase -s 2 -d 1 $ hg rebase -s 2 -d 1
rebasing 2:3504f44bffc0 f.patch qbase "P0" rebasing 2:3504f44bffc0 f.patch qbase "P0"
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')

tests/test-rebase-named-branches.t

o | 2: bc8139ee757c 'dev-one named branch' dev-one o | 2: bc8139ee757c 'dev-one named branch' dev-one
| | | |
| o 1: 9520eea781bc 'E' | o 1: 9520eea781bc 'E'
|/ |/
@ 0: cd010b8cd998 'A' @ 0: cd010b8cd998 'A'
$ hg rebase -s 5 -d 6 $ hg rebase -s 5 -d 6
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [10]
$ hg rebase -s 6 -d 5 $ hg rebase -s 6 -d 5
rebasing 6:3944801ae4ea "dev-two named branch" rebasing 6:3944801ae4ea "dev-two named branch"
rebasing 7:3bdb949809d9 "B" rebasing 7:3bdb949809d9 "B"
rebasing 8:a0d543090fa4 "C" rebasing 8:a0d543090fa4 "C"
rebasing 9:e9f862ce8bad tip "D" rebasing 9:e9f862ce8bad tip "D"
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg

tests/test-rebase-newancestor.t

$ hg phase -fdr0: $ hg phase -fdr0:
$ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
abort: rebasing 4:4b019212aaf6 will include unwanted changes from 1:1d1a643d390e abort: rebasing 4:4b019212aaf6 will include unwanted changes from 1:1d1a643d390e
[255] [10]
$ cd .. $ cd ..
Test order of parents of rebased merged with un-rebased changes as p1. Test order of parents of rebased merged with un-rebased changes as p1.
$ hg init parentorder $ hg init parentorder
$ cd parentorder $ cd parentorder
$ touch f $ touch f
> |/ > |/
> R > R
> EOS > EOS
$ hg rebase -r D+E+F -d Z $ hg rebase -r D+E+F -d Z
rebasing 5:5f2c926dfecf D "D" rebasing 5:5f2c926dfecf D "D"
rebasing 6:b296604d9846 E "E" rebasing 6:b296604d9846 E "E"
rebasing 7:caa9781e507d F tip "F" rebasing 7:caa9781e507d F tip "F"
abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d
[255] [10]
The warning does not get printed if there is no unwanted change detected: The warning does not get printed if there is no unwanted change detected:
$ hg init $TESTTMP/dual-merge-base2 $ hg init $TESTTMP/dual-merge-base2
$ cd $TESTTMP/dual-merge-base2 $ cd $TESTTMP/dual-merge-base2
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D > D
> /| > /|

tests/test-rebase-obsolete.t

> A > A
> EOF > EOF
$ hg rebase -d G -r 'B + D + F' $ hg rebase -d G -r 'B + D + F'
rebasing 1:112478962961 B "B" rebasing 1:112478962961 B "B"
rebasing 2:b18e25de2cf5 D "D" rebasing 2:b18e25de2cf5 D "D"
rebasing 6:f15c3adaf214 F tip "F" rebasing 6:f15c3adaf214 F tip "F"
abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
[255] [10]
$ cd .. $ cd ..
test on rebase dropping a merge test on rebase dropping a merge
(setup) (setup)
$ hg init dropmerge $ hg init dropmerge
branch: default branch: default
commit: (clean) commit: (clean)
update: 2 new changesets, 3 branch heads (merge) update: 2 new changesets, 3 branch heads (merge)
phases: 8 draft phases: 8 draft
orphan: 1 changesets orphan: 1 changesets
$ hg rebase -s 10 -d 12 $ hg rebase -s 10 -d 12
abort: this rebase will cause divergences from: 121d9e3bc4c6 abort: this rebase will cause divergences from: 121d9e3bc4c6
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [10]
$ hg log -G $ hg log -G
@ 14:73568ab6879d bar foo @ 14:73568ab6879d bar foo
| |
| o 13:77d874d096a2 10' | o 13:77d874d096a2 10'
| | | |
| | o 12:3eb461388009 john doe | | o 12:3eb461388009 john doe
| |/ | |/
x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2) x | 10:121d9e3bc4c6 P (rewritten using amend as 13:77d874d096a2)
If the rebase set has an obsolete (d) with a successor (d') outside the rebase If the rebase set has an obsolete (d) with a successor (d') outside the rebase
set and none in destination, we still get the divergence warning. set and none in destination, we still get the divergence warning.
By allowing divergence, we can perform the rebase. By allowing divergence, we can perform the rebase.
$ hg rebase -r 'c'::'f' -d 'x' $ hg rebase -r 'c'::'f' -d 'x'
abort: this rebase will cause divergences from: 76be324c128b abort: this rebase will cause divergences from: 76be324c128b
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [10]
$ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x' $ hg rebase --config experimental.evolution.allowdivergence=true -r 'c'::'f' -d 'x'
rebasing 3:a82ac2b38757 c "c" rebasing 3:a82ac2b38757 c "c"
rebasing 4:76be324c128b d "d" rebasing 4:76be324c128b d "d"
rebasing 7:1143e9adc121 f tip "f" rebasing 7:1143e9adc121 f tip "f"
1 new orphan changesets 1 new orphan changesets
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -r 'a':: -T instabilities $ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f o 10:e1744ea07510 f
This strip seems to be the key to avoid an early divergence warning. This strip seems to be the key to avoid an early divergence warning.
$ hg --config extensions.strip= --hidden strip -qr H $ hg --config extensions.strip= --hidden strip -qr H
1 new orphan changesets 1 new orphan changesets
$ hg rebase -b 'desc("D")' -d 'desc("J")' $ hg rebase -b 'desc("D")' -d 'desc("J")'
abort: this rebase will cause divergences from: 112478962961 abort: this rebase will cause divergences from: 112478962961
(to force the rebase please set experimental.evolution.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [10]
Rebase merge where both parents have successors in destination Rebase merge where both parents have successors in destination
$ hg init p12-succ-in-dest $ hg init p12-succ-in-dest
$ cd p12-succ-in-dest $ cd p12-succ-in-dest
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> E F > E F
> /| /| # replace: A -> C > /| /| # replace: A -> C
> A B C D # replace: B -> D > A B C D # replace: B -> D
> | | > | |
> X Y > X Y
> EOS > EOS
1 new orphan changesets 1 new orphan changesets
$ hg rebase -r A+B+E -d F $ hg rebase -r A+B+E -d F
note: not rebasing 4:a3d17304151f A "A", already in destination as 0:96cc3511f894 C "C" note: not rebasing 4:a3d17304151f A "A", already in destination as 0:96cc3511f894 C "C"
note: not rebasing 5:b23a2cc00842 B "B", already in destination as 1:058c1e1fb10a D "D" note: not rebasing 5:b23a2cc00842 B "B", already in destination as 1:058c1e1fb10a D "D"
rebasing 7:dac5d11c5a7d E tip "E" rebasing 7:dac5d11c5a7d E tip "E"
abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
[255] [10]
$ cd .. $ cd ..
Rebase a non-clean merge. One parent has successor in destination, the other Rebase a non-clean merge. One parent has successor in destination, the other
parent moves as requested. parent moves as requested.
$ hg init p1-succ-p2-move $ hg init p1-succ-p2-move
$ cd p1-succ-p2-move $ cd p1-succ-p2-move
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240] [240]
$ hg rebase --stop $ hg rebase --stop
abort: cannot remove original changesets with unrebased descendants abort: cannot remove original changesets with unrebased descendants
(either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets) (either enable obsmarkers to allow unstable revisions or use --keep to keep original changesets)
[255] [20]
$ hg rebase --abort $ hg rebase --abort
saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg saved backup bundle to $TESTTMP/rbstop/.hg/strip-backup/b15528633407-6eb72b6f-backup.hg
rebase aborted rebase aborted
Test --stop when --keep is passed: Test --stop when --keep is passed:
================================== ==================================
$ hg rebase -s 1 -d 5 --keep $ hg rebase -s 1 -d 5 --keep
rebasing 1:d2ae7f538514 "b" rebasing 1:d2ae7f538514 "b"
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240] [240]
$ hg rebase --stop $ hg rebase --stop
abort: cannot stop in --collapse session abort: cannot stop in --collapse session
[255] [20]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg diff $ hg diff
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
o 5:00bfc9898aeb test o 5:00bfc9898aeb test
| conflict with d | conflict with d
| |
o 4:dafd40200f93 test o 4:dafd40200f93 test

tests/test-rebase-parameters.t

[1] [1]
$ hg rebase --continue --abort $ hg rebase --continue --abort
abort: cannot specify both --abort and --continue abort: cannot specify both --abort and --continue
[10] [10]
$ hg rebase --continue --collapse $ hg rebase --continue --collapse
abort: cannot use collapse with continue or abort abort: cannot use collapse with continue or abort
[255] [10]
$ hg rebase --continue --dest 4 $ hg rebase --continue --dest 4
abort: cannot specify both --continue and --dest abort: cannot specify both --continue and --dest
[10] [10]
$ hg rebase --base 5 --source 4 $ hg rebase --base 5 --source 4
abort: cannot specify both --source and --base abort: cannot specify both --source and --base
[10] [10]
[255] [255]
$ hg rebase --rev '1 & !1' --dest 8 $ hg rebase --rev '1 & !1' --dest 8
empty "rev" revision set - nothing to rebase empty "rev" revision set - nothing to rebase
[1] [1]
$ hg rebase --rev 'wdir()' --dest 6 $ hg rebase --rev 'wdir()' --dest 6
abort: cannot rebase the working copy abort: cannot rebase the working copy
[255] [10]
$ hg rebase --source 'wdir()' --dest 6 $ hg rebase --source 'wdir()' --dest 6
abort: cannot rebase the working copy abort: cannot rebase the working copy
[255] [10]
$ hg rebase --source 1 --source 'wdir()' --dest 6 $ hg rebase --source 1 --source 'wdir()' --dest 6
abort: cannot rebase the working copy abort: cannot rebase the working copy
[255] [10]
$ hg rebase --source '1 & !1' --dest 8 $ hg rebase --source '1 & !1' --dest 8
empty "source" revision set - nothing to rebase empty "source" revision set - nothing to rebase
[1] [1]
$ hg rebase --base '1 & !1' --dest 8 $ hg rebase --base '1 & !1' --dest 8
empty "base" revision set - can't compute rebase set empty "base" revision set - can't compute rebase set
[1] [1]
[20] [20]
$ hg rebase -c --tool internal:fail $ hg rebase -c --tool internal:fail
rebasing 2:e4e3f3546619 tip "c2b" rebasing 2:e4e3f3546619 tip "c2b"
note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes note: not rebasing 2:e4e3f3546619 tip "c2b", its destination already has all its changes
saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg
$ hg rebase -i $ hg rebase -i
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
[255] [10]
$ hg rebase --interactive $ hg rebase --interactive
abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit")
[255] [10]
$ cd .. $ cd ..
No common ancestor No common ancestor
$ hg init separaterepo $ hg init separaterepo
$ cd separaterepo $ cd separaterepo
$ touch a $ touch a
$ hg commit -Aqm a $ hg commit -Aqm a
$ hg up -q null $ hg up -q null
$ touch b $ touch b
$ hg commit -Aqm b $ hg commit -Aqm b
$ hg rebase -d 0 $ hg rebase -d 0
nothing to rebase from d7486e00c6f1 to 3903775176ed nothing to rebase from d7486e00c6f1 to 3903775176ed
[1] [1]
$ cd .. $ cd ..

tests/test-rebase-scenario-global.t

$ hg rebase -s 6 -d 5 $ hg rebase -s 6 -d 5
nothing to rebase nothing to rebase
[1] [1]
F onto G - rebase onto a descendant: F onto G - rebase onto a descendant:
$ hg rebase -s 5 -d 6 $ hg rebase -s 5 -d 6
abort: source and destination form a cycle abort: source and destination form a cycle
[255] [10]
G onto B - merge revision with both parents not in ancestors of target: G onto B - merge revision with both parents not in ancestors of target:
$ hg rebase -s 6 -d 1 $ hg rebase -s 6 -d 1
rebasing 6:eea13746799a "G" rebasing 6:eea13746799a "G"
abort: cannot rebase 6:eea13746799a without moving at least one of its parents abort: cannot rebase 6:eea13746799a without moving at least one of its parents
[255] [10]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
These will abort gracefully (using --base): These will abort gracefully (using --base):
G onto G - rebase onto same changeset: G onto G - rebase onto same changeset:
$ hg rebase -b 6 -d 6 $ hg rebase -b 6 -d 6