Page MenuHomePhabricator

relnotes: copy "next" to "5.1" and clear "next"
ClosedPublic

Authored by martinvonz on Aug 1 2019, 4:35 PM.

Details

Summary

To avoid merge conflicts, we want to avoid modifying the file on
multiple branches in parallel. This patch is therefore meant to be
applied to the stable branch and then quickly be merged to default (at
least before edits are made to relnotes/next there).

Another option would have been to copy the file on the stable branch
and to clear it on the default branch. However, that still results in
conflicts if the copy is edited on the stable branch (Mercurial would
try to apply the changes from the default branch to it).

We could also delete the file in one commit and recreate it in another
commit. However, Mercurial is quite inconsistent in what it considers
a break in history (see test-copies-unrelated.t), so I'd like to avoid
that.

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.Aug 1 2019, 4:35 PM
pulkit accepted this revision.Aug 6 2019, 7:26 AM
This revision is now accepted and ready to land.Aug 6 2019, 7:26 AM
This revision was automatically updated to reflect the committed changes.