This is an archive of the discontinued Mercurial Phabricator instance.

relnotes: copy contents of "next" to "5.8" and clear "next"
ClosedPublic

Authored by martinvonz on Apr 20 2021, 11:28 AM.

Details

Summary

The same procedure as every year^Wcycle.

Unlike previous cycles, I haven't actually recorded the copy because
we don't want to propagate further changes in "next" (from the stable
branch) to "5.8".

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

martinvonz created this revision.Apr 20 2021, 11:28 AM
martinvonz retitled this revision from relnotes: copy "next" to "5.8" and clear "next" to relnotes: copy contents of "next" to "5.8" and clear "next".Apr 20 2021, 11:43 AM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 27132.

Hmm, this will conflict D10496 etc (which I assume are meant for the stable branch just like this patch is). I'm fine with that series or this patch getting queued first. Actually, take that series first since it touches the file several times (I'll just have to resolve the conflict once while @marmoute would have to resolve it several times).

Alphare requested changes to this revision.Apr 21 2021, 8:34 AM
Alphare added a subscriber: Alphare.

I've taken @marmoute 's series first as you suggested, you can rebase yours now. Thanks for noticing!

This revision now requires changes to proceed.Apr 21 2021, 8:34 AM
martinvonz updated this revision to Diff 27195.Apr 28 2021, 2:16 PM
Alphare accepted this revision.Apr 29 2021, 10:58 AM
This revision is now accepted and ready to land.Apr 29 2021, 10:58 AM