Mercurial Mercurial > mercurial / 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 Matt Harbison <matt_harbison@yahoo.com>
Fri, 04 Sep 2020 15:21:02 -0400
branchstable
changeset 45412 aaeccdb6e654
parent 30084 a492610a2fc1
permissions -rw-r--r--
repoview: pin revisions for `local` and `other` when a merge is active I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes `p1` and updating to the successor results in merge conflicts. The problem was resolving them failed immediately, complaining that the old checkout was filtered. The change in `test-rebase-obsolete.t` is because there's an outstanding merge conflict in a rebase operation. The summary prompt to merge seems incorrect for this scenario, but that's an existing issue. Differential Revision: https://phab.mercurial-scm.org/D8980
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).














mercurial