This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8355

tests: demonstrate how continuing rebase after upgrade can result in merge
ClosedPublic

Authored by martinvonz on Apr 1 2020, 5:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe89b3603d3da: tests: demonstrate how continuing rebase after upgrade can result in merge
Summary

If the user starts a rebase with an hg version before 9c9cfecd4600
(rebase: don't use rebased node as dirstate p2 (BC), 2020-01-10) and
then runs into conflicts, they will be dropped out to the shell with
the rebased node set as the dirstate's second parent. If they then
upgrade to a later hg version, it will respect the dirstate's parents
and will create a merge commit even if the user was rebasing a
non-merge commit.

Diff Detail

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

Event Timeline

martinvonz created this revision.Apr 1 2020, 5:46 PM
martinvonz added a commit: rHGe89b3603d3da: tests: demonstrate how continuing rebase after upgrade can result in merge.Apr 3 2020, 11:04 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe89b3603d3da: tests: demonstrate how continuing rebase after upgrade can result in merge (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-interruptions.t (65 lines)

Diff 20957

tests/test-rebase-interruptions.t

$ hg up 2 $ hg up 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo F > F $ echo F > F
$ hg add F $ hg add F
$ hg ci -m F $ hg ci -m F
$ cd .. $ cd ..
Continue rebase after upgrading from an hg version before 9c9cfecd4600:
$ hg clone -q -u . a a4
$ cd a4
$ hg tglog
@ 4: ae36e8e3dfd7 'E'
|
o 3: 46b37eabc604 'D'
|
| o 2: 965c486023db 'C'
| |
| o 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
$ hg rebase -s 1 -d 4
rebasing 1:27547f69f254 "B"
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ hg tglog
@ 5: 45396c49d53b 'B'
|
o 4: ae36e8e3dfd7 'E'
|
o 3: 46b37eabc604 'D'
|
| % 2: 965c486023db 'C'
| |
| o 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
Simulate having run the above with an older hg version by manually setting
two dirstate parents. We should not get a merge commit when we continue.
$ hg debugsetparents 5 2
$ echo 'conflict solved' > A
$ hg resolve -m A
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
already rebased 1:27547f69f254 "B" as 45396c49d53b
rebasing 2:965c486023db "C"
warning: orphaned descendants detected, not stripping 27547f69f254, 965c486023db
BROKEN: we should not have a merge commit here
$ hg tglog
o 6: 567335b578a0 'C'
|\
| o 5: 45396c49d53b 'B'
| |
| @ 4: ae36e8e3dfd7 'E'
| |
| o 3: 46b37eabc604 'D'
| |
o | 2: 965c486023db 'C'
| |
o | 1: 27547f69f254 'B'
|/
o 0: 4a2df7238c3b 'A'
$ cd ..
(precommit version) (precommit version)
$ cp -R a3 hook-precommit $ cp -R a3 hook-precommit
$ cd hook-precommit $ cd hook-precommit
$ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"' $ hg rebase --source 2 --dest 5 --tool internal:other --config 'hooks.precommit=hg status | grep "M A"'
rebasing 2:965c486023db "C" rebasing 2:965c486023db "C"
M A M A
rebasing 6:a0b2430ebfb8 "F" (tip) rebasing 6:a0b2430ebfb8 "F" (tip)