Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CONTRIBUTING
author Kyle Lippincott <spectral@google.com>
Tue, 07 Sep 2021 11:50:12 -0700
branchstable
changeset 47874 053dd53a0b59
parent 30084 a492610a2fc1
permissions -rw-r--r--
filemerge: be more strict when detecting conflict markers, add `|` markers I received a user complaint about detecting a line that contained 78 `=` followed by `*/` as a conflict marker. We'll never generate that, we generate 7 identical characters and either the end of the line, or a space. Let's be explicit about detecting exactly what we produce to reduce the chances of a false positive. While we're here, add `|||||||` as a detected conflict marker (generated with the `keep-merge3` style conflicts). Differential Revision: https://phab.mercurial-scm.org/D11391
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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).















hg-stable