Mercurial > hg
annotate CONTRIBUTING @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | a492610a2fc1 |
children |
rev | line source |
---|---|
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). |