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 Pulkit Goyal <7895pulkit@gmail.com>
Mon, 24 Aug 2020 17:22:28 +0530
changeset 45480 49ffaa4f65f6
parent 30084 a492610a2fc1
permissions -rw-r--r--
merge: add missing ACTION_KEEP when both remote and ancestor are not present Previous patch may lead to confusion that the related criss-cross merge is consistent when done from any of the parents. However this is not true and we were missing setting an ACTION_KEEP. This patch now exposes that bid-merge favors ACTION_KEEP always and the result of merge is different when started from different parents. This change also effects a test case above where bid merge was wrongly picking `r` because it was missing keep related information from one of the ancestor. After this test, we are back in a state in the criss-cross merge tests where the result depends on which parent we are merging from. Differential Revision: https://phab.mercurial-scm.org/D8941
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