view .gitlab/issue_templates/new-version.md @ 5926:aca07ac01167

divergence-resolution: use last evolution date to choose p1 when merging

Before this patch, we choose the minimum revision as p1 while merging the
two divergent csets which had a drawback that if independent user resolve
the same divergence, their final resolved cset would have different hashes
(because of 'divergence_source_local' and 'divergence_source_other' extras).

Now, we decide the p1 on the basis of which of the two divergent cset
was rewritten more recently. This new logic removes the "different hash"
problem.

To save us from big output changes in the tests due to this change, I also
added the second factor i.e revision_number while sorting the csets wrt dates
(as date is same for all the csets in tests) to fallback to the old way of
picking the revision i.e choosing the minimum rev number.

And to demonstrate that now divergence resolution is independent of which
side user run the `hg evolve --content-div` resolved cset id won't change,
I have added a separate test file.
Flag --config devel.default-date='...' is being used here to record a
custom date in the obsmarkers.

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 [e-mail]
* [ ] send the announcement by email to [e-mail]
* [ ] publish the announcement as a blog on https://octobus.net/blog/
* [ ] tweet about it