hg-stable: CONTRIBUTING@98663bed146e (annotated)

rebase: store rebase state after each commit Before this patch, we stored the rebase state early in the processing of a node, before we updated the rebase state to indicate that the node was processed. This meant that we could redo the working copy merge and run into conflicts. However, this only happened in the --collapse case if the rebase was interrupted while editing the final commit message; in the case earlier interruptions, we would instead detect the in-process revision by finding two dirstate parents. This patch moves the writing of the rebase state to after we have completed the revision completely, and, importantly, after we have updated the rebase state to mark it done. This means we'll realize that all nodes have been rebased in the case mentioned above of editing the final commit message of a --collapse. See change to test case. I also moved the writing outside of the large if/elif block in _rebasenode(). This shouldn't matter much, but seems cleaner. One observable effect is if rebase was interrupted just after ignoring an obsolete node ("not rebasing ####, already in destination"), we used to come up with the same decision after --continue too, but after this patch we'll instead say "already rebased ###". This seems more consistent, since that's what we would do with obsolete nodes that had been marked done earlier in the process (not only just before the interruption). Differential Revision: https://phab.mercurial-scm.org/D2913

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	Martin von Zweigbergk <martinvonz@google.com>
	Wed, 21 Mar 2018 11:01:19 -0700
changeset 37035	98663bed146e
parent 30084	a492610a2fc1
permissions	-rw-r--r--