Mercurial Mercurial > hg / 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 Martin von Zweigbergk <martinvonz@google.com>
Mon, 07 Feb 2022 22:54:38 -0800
changeset 48760 93d6f0e7ba2f
parent 30084 a492610a2fc1
permissions -rw-r--r--
filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154
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