This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7728

rebase: add test to demonstrate issue6180
Needs RevisionPublic

Authored by khanchi97 on Dec 27 2019, 11:56 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Summary

It will be fixed in next patch.

Diff Detail

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

Event Timeline

khanchi97 created this revision.Dec 27 2019, 11:56 AM
pulkit added a subscriber: pulkit.Jan 9 2020, 9:19 AM
pulkit added inline comments.
tests/test-rebase-conflicts.t
438

You don't need to redefine it.

khanchi97 updated this revision to Diff 19282.Jan 15 2020, 5:42 AM
khanchi97 updated this revision to Diff 19815.Feb 1 2020, 1:40 PM
marmoute added a subscriber: marmoute.Feb 1 2020, 6:46 PM

Cf my comment on D7730, I think the bug is more about letting others commands obsoleting things happens (eg, amend, pull, etc) than rebase being confused by the result.

marmoute requested changes to this revision.Feb 14 2020, 3:38 AM

As per comment of Pulkit and I on D7730, please spin this test toward forbiding the prune while the rebase is in progress.

This revision now requires changes to proceed.Feb 14 2020, 3:38 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-conflicts.t (63 lines)

Diff 19815

tests/test-rebase-conflicts.t

@ 3:draft 'E' @ 3:draft 'E'
| |
| o 2:draft 'C' | o 2:draft 'C'
| | | |
| o 1:draft 'B' | o 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
Test to make sure that pruning while rebasing doesn't confuse rebase (issue6180)
$ cat >> $HGRCPATH <<EOF
> [experimental]
> evolution.createmarkers=True
> evolution.allowunstable=True
> [rebase]
> experimental.inmemory=1
pulkitUnsubmitted
Not Done

You don't need to redefine it.

pulkit: You don't need to redefine it.
> EOF
The test case below starts a rebase of 2 commits and runs into conflicts on
the first one. We then decide we don't want the changes from that commit, so
we revert the changes and also prune the original commit.
Now what we expect from `hg rebase --continue` is that it skip rebasing first
one (since it's pruned) but don't skip second one.
$ hg init issue6180
$ cd issue6180
$ echo 0 > a
$ hg ci -Aqm 'add a'
$ echo 1 > a
$ hg ci -m 'edit a'
$ hg co -q 0
$ echo 2 > a
$ hg ci -qm 'conflict in a'
$ echo 3 > b
$ hg ci -Aqm 'add b'
$ hg tglog
@ 3:draft 'add b'
|
o 2:draft 'conflict in a'
|
| o 1:draft 'edit a'
|/
o 0:draft 'add a'
$ hg rebase -d 1
rebasing 2:06a50ac6b5ab "conflict in a"
merging a
hit merge conflicts; re-running rebase without in-memory merge
rebasing 2:06a50ac6b5ab "conflict in a"
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
$ echo 1 > a
$ hg debugobsolete $(hg id -ir 2 --debug)
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
$ hg resolve -m
(no more unresolved files)
continue: hg rebase --continue
XXX: it should have rebased revision 3 since it made changes unrelated to
destination, so no reason to say "its destination already has all its changes"
$ hg rebase -c
note: not rebasing 2:06a50ac6b5ab "conflict in a", it has no successor
rebasing 3:aea370672fd7 "add b" (tip)
note: not rebasing 3:aea370672fd7 "add b" (tip), its destination already has all its changes
$ hg tglog
@ 1:draft 'edit a'
|
o 0:draft 'add a'