annotate .gitlab/merge_request_templates/Default.md @ 51310:f0e7d51bb454 stable

pycompat: fix bytestr(bytes) in Python 3.11 In Python 3.10, the `bytes` type itself does not have a `__bytes__` attribute, but it does in 3.11. Yet `bytes(bytes)` does not give the wished output, so we have to add an exceptional case. The added case in the doctest reproduces the problem with Python 3.11. Impact: error treatment in expressions such as `repo[b'invalid']` gets broken.
author Georges Racinet <georges.racinet@octobus.net>
date Wed, 03 Jan 2024 18:33:39 +0100
parents 7b6d3a9bd7be
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49216
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 /assign_reviewer @mercurial.review
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
2
49535
7b6d3a9bd7be mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents: 49268
diff changeset
3
7b6d3a9bd7be mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents: 49268
diff changeset
4 <!--
7b6d3a9bd7be mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents: 49268
diff changeset
5
49216
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
6 Welcome to the Mercurial Merge Request creation process:
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
7
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
8 * Set a simple title for your MR,
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
9 * All important information should be contained in your changesets' content or description,
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
10 * You can add some workflow-relevant information here (eg: when this depends on another MR),
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
11 * If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
12
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
13 More details here:
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
14
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
15 * https://www.mercurial-scm.org/wiki/ContributingChanges
9ea9445c3223 workflow: add a default template for Merge Request
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
16 * https://www.mercurial-scm.org/wiki/Heptapod
49535
7b6d3a9bd7be mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents: 49268
diff changeset
17
7b6d3a9bd7be mr-template: wrap the instructions inside a comment block
Matt Harbison <matt_harbison@yahoo.com>
parents: 49268
diff changeset
18 -->