Page MenuHomePhabricator

rebase: add test case that shows that inmemory rebase does not preserve merges
ClosedPublic

Authored by mjacob on Fri, Jul 10, 6:54 PM.

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

mjacob created this revision.Fri, Jul 10, 6:54 PM

This patch is based on c4e02bd172d57879717f8bc04c4b5bbc9268e36d, but I don't see any such commit. Can you rebase it to a public commit?

This patch is based on c4e02bd172d57879717f8bc04c4b5bbc9268e36d, but I don't see any such commit. Can you rebase it to a public commit?

I rebased D8724 to D8733 onto @. Strictly speaking, D8727 is not dependent on D8725 or D8724, but D8729 is dependent on D8724, so it made sense to keep all of them as a linear chain.

This patch is based on c4e02bd172d57879717f8bc04c4b5bbc9268e36d, but I don't see any such commit. Can you rebase it to a public commit?

I rebased D8724 to D8733 onto @. Strictly speaking, D8727 is not dependent on D8725 or D8724, but D8729 is dependent on D8724, so it made sense to keep all of them as a linear chain.

It does seem to be textually dependent on D8724 -- the patch didn't apply before. Thanks!