D8115: rebase: show bug when rebasing merge with obsoleted revs on both sides

marmoute added a comment. In D8115#121345 , @martinvonz wrote: > We already have tests for this (grepping for "unwanted changes" in `tests/` should be enough to find them). > It's not easy to omit revisions 8 and 10 from the rebase. The key

D8115: rebase: show bug when rebasing merge with obsoleted revs on both sides

martinvonz added a comment. We already have tests for this (grepping for "unwanted changes" in `tests/` should be enough to find them). It's not easy to omit revisions 8 and 10 from the rebase. The key is to realize that rebase is done by repeated grafting of diffs and that the diffs ar

D8115: rebase: show bug when rebasing merge with obsoleted revs on both sides

durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY By inspection, the rebase should be fine: "just" omit 8 and 10 from the rebase. This is a simplified case of something we're seeing at Google. DO NOT ACCEPT