Mercurial > evolve
view .gitlab/issue_templates/new-version.md @ 5787:32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.
It was supposed to test that that it hits conflict while relocating the
divergent cset but because of some change in previous patches, relocation went
successful and it hits conflict while merging the two divergent csets.
This patch, by making some changes in files content make sure that we get
conflict during relocation.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 24 Jan 2021 20:09:02 +0530 |
| parents | ca76e63e76dc |
| children | df204c64faab 7eb5b33868bc |
line wrap: on
line source
This is the actual check list for releasing evolve version X.Y.Z More details in the [README.rst file](README.rst#L199). Preparation * [ ] merges with compatibility branches * [ ] compatibility tests are happy * [ ] update `testedwith` field * [ ] make sure the changelog is up to data * [ ] [prepare an announcement for the list/website](https://mypads.framapad.org/mypads/?/mypads/group/octobus-public-5d3rw470w/pad/view/evolution-announce-iswcp7qx) * [ ] sanity check install and sdist targets of setup.py Releasing * [ ] add the current date to the changelog * [ ] update the `__version__` field of all relevant extensions * [ ] create a new Debian entry * [ ] tag the version * [ ] move the `@` bookmark on the new tag * [ ] push/publish the tag to the main repository * [ ] upload the tarball to PyPI * [ ] add `.dev` to the `__version__` field * [ ] merge stable into default * [ ] push the result on the main repo * [ ] send the announcement by email to evolve-testers@mercurial-scm.org * [ ] send the announcement by email to mercurial@mercurial-scm.org * [ ] publish the announcement as a blog on https://octobus.net/blog/ * [ ] tweet about it