hg-stable: CONTRIBUTING@b6269741ed42 (annotated)

config: add option to control creation of empty successors during rewrite The default for many history-rewriting commands (e.g. rebase and absorb) is that changesets which would become empty are not created in the target branch. This makes sense if the source branch consists of small fix-up changes. For more advanced workflows that make heavy use of history-editing to create curated patch series, dropping empty changesets is not as important or even undesirable. Some users want to keep the meta-history, e.g. to make finding comments in a code review tool easier or to avoid that divergent bookmarks are created. For that, obsmarkers from the (to-be) empty changeset to the changeset(s) that already made the changes should be added. If a to-be empty changeset is pruned without a successor, adding the obsmarkers is hard because the changeset has to be found within the hidden part of the history. If rebasing in TortoiseHg, it’s easy to miss the fact that the to-be empty changeset was pruned. An empty changeset will function as a reminder that obsmarkers should be added. Martin von Zweigbergk mentioned another advantage. Stripping the successor will de-obsolete the predecessor. If no (empty) successor is created, this won’t be possible. In the future, we may want to consider other behaviors, like e.g. creating the empty successor, but pruning it right away. Therefore this configuration accepts 'skip' and 'keep' instead of being a boolean configuration.

30084 a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	1	Our full contribution guidelines are in our wiki, please see:
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	2
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	3	https://www.mercurial-scm.org/wiki/ContributingChanges
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	4
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	5	If you just want a checklist to follow, you can go straight to
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	6
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	7	https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	8
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	9	If you can't run the entire testsuite for some reason (it can be
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	10	difficult on Windows), please at least run `contrib/check-code.py` on
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	11	any files you've modified and run `python contrib/check-commit` on any
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	12	commits you've made (for example, `python contrib/check-commit
a492610a2fc1 contributing: add new file with a pointer to the wiki Augie Fackler <augie@google.com> parents: diff changeset	13	273ce12ad8f1` will report some style violations on a very old commit).

author	Manuel Jacob <me@manueljacob.de>
	Sat, 11 Jul 2020 23:53:27 +0200
changeset 45121	b6269741ed42
parent 30084	a492610a2fc1
permissions	-rw-r--r--