Page MenuHomePhabricator

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.Sat, Feb 1, 1:40 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.Fri, Feb 14, 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.Fri, Feb 14, 3:38 AM