This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10256

tests: test divergence created during interrupted rebase
ClosedPublic

Authored by martinvonz on Mar 24 2021, 2:24 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6648307d4fe8: tests: test divergence created during interrupted rebase
Summary

If a rebase runs into conflicts and the user somehow rewrites an
unrebased commit in the rebase set while the rebase is interrupted,
continuing it might result in divergence. It turns out that we decide
to skip the commit. That seems to make sense, but it wasn't obvious to
me that that's what we should do. Either way, this patch adds a test
case for the current behavior.

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.

Event Timeline

martinvonz created this revision.Mar 24 2021, 2:24 AM
martinvonz added a commit: rHG6648307d4fe8: tests: test divergence created during interrupted rebase.Mar 25 2021, 5:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6648307d4fe8: tests: test divergence created during interrupted rebase (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete3.t (43 lines)

Diff 26587

tests/test-rebase-obsolete3.t

x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa) x | 2:a82ac2b38757 c (rewritten using replace as 3:ef8a456de8fa)
|/ |/
o 1:488e1b7e7341 b o 1:488e1b7e7341 b
| |
o 0:b173517d0057 a o 0:b173517d0057 a
$ cd .. $ cd ..
Start a normal rebase. When it runs into conflicts, rewrite one of the
commits in the rebase set, causing divergence when the rebase continues.
$ hg init $TESTTMP/new-divergence-after-conflict
$ cd $TESTTMP/new-divergence-after-conflict
$ hg debugdrawdag <<'EOS'
> C2
> | C1
> |/
> B # B/D=B
> | D
> |/
> A
> EOS
$ hg rebase -r B::C1 -d D
rebasing 1:2ec65233581b B "B"
merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240]
$ hg debugobsolete $(hg log -r C1 -T '{node}') $(hg log -r C2 -T '{node}')
1 new obsolescence markers
obsoleted 1 changesets
$ hg log -G
o 4:fdb9df6b130c C2
|
| x 3:7e5bfd3c08f0 C1 (rewritten as 4:fdb9df6b130c)
|/
| @ 2:b18e25de2cf5 D
| |
% | 1:2ec65233581b B
|/
o 0:426bada5c675 A
$ echo resolved > D
$ hg resolve -m D
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase -c
rebasing 1:2ec65233581b B "B"
note: not rebasing 3:7e5bfd3c08f0 C1 "C1" and its descendants as this would cause divergence
1 new orphan changesets
Rebase merge where successor of one parent is equal to destination (issue5198) Rebase merge where successor of one parent is equal to destination (issue5198)
$ hg init p1-succ-is-dest $ hg init p1-succ-is-dest
$ cd p1-succ-is-dest $ cd p1-succ-is-dest
$ hg debugdrawdag <<EOF $ hg debugdrawdag <<EOF
> F > F
> /| > /|