This is an archive of the discontinued Mercurial Phabricator instance.

Differential D212

tests: demonstrate crash when trying to rebase merge without its parents
ClosedPublic

Authored by martinvonz on Aug 2 2017, 1:10 AM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG855a1856466d: tests: demonstrate crash when trying to rebase merge without its parents
Summary

As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on
the following graph, we crash with traceback. It's reasonable to fail
because we can not easily produce a correct rebased F. The problem is
what diff to apply to either the rebased B or the rebased D. We could
potentially produce the result by e.g. applying the (F-D) diff to the
rebased B and then applying the reverse (E-D) diff on top, but that
could result in merge conflicts in each of those steps, which we don't
have a way of dealing with. So for now, let's just add a test case to
demonstrate that we crash (i.e. the AssertionError is clearly
incorrect since the user can run into it).

F

/|
C E

B D G
\|/

A

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete.t (21 lines)

Diff 524

tests/test-rebase-obsolete.t

| o 5:24b6387c8c8c F | o 5:24b6387c8c8c F
| | | |
o | 4:9520eea781bc E o | 4:9520eea781bc E
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ cd .. $ cd ..
Detach both parents
$ hg init double-detach
$ cd double-detach
$ hg debugdrawdag <<EOF
> F
> /|
> C E
> | |
> B D G
> \|/
> A
> EOF
BROKEN: This raises an exception
$ hg rebase -d G -r 'B + D + F' 2>&1 | grep '^AssertionError'
AssertionError: no base found to rebase on (defineparents called wrong)
$ cd ..
test on rebase dropping a merge test on rebase dropping a merge
(setup) (setup)
$ hg init dropmerge $ hg init dropmerge
$ cd dropmerge $ cd dropmerge
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets