Mercurial > evolve
view .gitlab/issue_templates/new-version.md @ 5730:a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
While deciding the resolution parent for content-divergence resolution, now we
use 3-way merge logic to check, if only one of them was moved from its original
position by comparing the parent of both divergent cset with parent of base.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 22 Jan 2021 05:37:43 +0100 |
| 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