Richard Brooksby
|
285016a095
|
Clarifying what to do if contributor varies licensing.
|
2023-01-13 04:43:00 +00:00 |
|
Richard Brooksby
|
1cf9efeb18
|
Adding instructions for the checklist.
|
2023-01-13 04:39:45 +00:00 |
|
Richard Brooksby
|
1a09d9c140
|
Forgot to push to a fresh branch in the previous change.
|
2023-01-12 21:53:51 +00:00 |
|
Richard Brooksby
|
fbcc92139f
|
Implementing a more natural strategy by separating the use of ci from updating the branch. see also <https://github.com/ravenbrook/mps/pull/97#issuecomment-1380980005>.
|
2023-01-12 21:34:30 +00:00 |
|
Richard Brooksby
|
3e4bb50338
|
Attempt to prevent github rewriting links to github by using a code quotation.
|
2023-01-12 18:15:35 +00:00 |
|
Richard Brooksby
|
790d46258b
|
Adding instructions for the commit message on the merge.
|
2023-01-11 02:08:30 +00:00 |
|
Richard Brooksby
|
f1a329c27b
|
Using travis ci's "blocklisting" to exclude branches, rather than a conditional expression, for easier management and diffs.
|
2023-01-10 22:13:07 +00:00 |
|
Richard Brooksby
|
91b02cdf1b
|
Adding note about varying the procedure for pull requests not on github.
|
2023-01-10 13:34:37 +00:00 |
|
Richard Brooksby
|
2c58a15841
|
Adding link to pull request template docs.
|
2023-01-10 11:04:56 +00:00 |
|
Richard Brooksby
|
904a344200
|
Removing draft status.
|
2023-01-10 10:19:38 +00:00 |
|
Richard Brooksby
|
01bdb0c1c2
|
Linking refs to github repo for ease-of-use.
|
2023-01-10 10:19:11 +00:00 |
|
Richard Brooksby
|
ab87f23af5
|
Adding reference to github branch protection rules.
|
2023-01-10 10:17:38 +00:00 |
|
Richard Brooksby
|
11a02bf064
|
Removing comment about customer-specific branches. this case is covered by asking whether the contribution is licensed.
|
2023-01-10 09:05:03 +00:00 |
|
Richard Brooksby
|
9a63055809
|
Minor clarifications.
|
2023-01-10 09:04:28 +00:00 |
|
Richard Brooksby
|
b4d14479c6
|
I was mislead by [chaser324_2017]. removed it and arguments from it. improved the rationale. explained how and when we can use the github merge button.
|
2023-01-10 08:54:34 +00:00 |
|
Richard Brooksby
|
b3ca307426
|
Attempt to disable builds for this branch, branch/2023-01-07/pull-request-merge-procedure, in response to travis ci support case 42422.
|
2023-01-10 08:10:53 +00:00 |
|
Richard Brooksby
|
853c82b784
|
Adding note about [chaser324_2017]_ being misleading about the merge button.
|
2023-01-10 08:08:55 +00:00 |
|
Richard Brooksby
|
b2d5fd440c
|
Improving language and fixing a typo.
|
2023-01-09 09:31:09 +00:00 |
|
Richard Brooksby
|
2c8bf3dac1
|
Avoid renaming correctly named branches.
|
2023-01-09 09:29:18 +00:00 |
|
Richard Brooksby
|
3cf43d1fcc
|
Updating old procedure section title inherited from [gdr_2014-01-09].
|
2023-01-09 09:22:54 +00:00 |
|
Richard Brooksby
|
65332f4e11
|
Simplifying the procedure by avoiding pushing via the local master, removing the strange fast-forward step.
|
2023-01-09 09:21:32 +00:00 |
|
Richard Brooksby
|
e9d062693a
|
Pulling the branch to be merged directly from the pr ref at github, removing a step.
|
2023-01-09 09:00:47 +00:00 |
|
Richard Brooksby
|
35441b92a1
|
Clarifying what replacing master achieves.
|
2023-01-09 08:44:24 +00:00 |
|
Richard Brooksby
|
fb8595a21a
|
Naming the perforce git fusion remote "perforce" for clarity.
|
2023-01-09 08:39:26 +00:00 |
|
Richard Brooksby
|
4980c22891
|
Removing redundant branch name in push command.
|
2023-01-09 08:34:21 +00:00 |
|
Richard Brooksby
|
ee842fd76a
|
If there's a race on master we must back out our update. there might be a better method.
|
2023-01-09 08:21:40 +00:00 |
|
Richard Brooksby
|
1e3e49c66b
|
Fixing numbered list markup.
|
2023-01-09 08:18:13 +00:00 |
|
Richard Brooksby
|
9f3366613a
|
Adding reference to git migration issue.
|
2023-01-08 15:25:48 +00:00 |
|
Richard Brooksby
|
5d736f3acd
|
Fixing list markup.
|
2023-01-08 15:24:20 +00:00 |
|
Richard Brooksby
|
cbcf43f2e4
|
Fixing typo.
|
2023-01-08 10:00:50 +00:00 |
|
Richard Brooksby
|
77ae2c3e7f
|
Correcting step cross-references.
|
2023-01-08 09:56:07 +00:00 |
|
Richard Brooksby
|
e294829d97
|
Updating master first, so that problems with that are more likely to occur in context.
|
2023-01-08 09:52:14 +00:00 |
|
Richard Brooksby
|
11b9b6ed0d
|
Moving licensing check to checklist to simplify main procedure.
|
2023-01-08 09:49:12 +00:00 |
|
Richard Brooksby
|
ab78c4ffca
|
Clarifying that you can use your existing repo.
|
2023-01-08 09:40:55 +00:00 |
|
Richard Brooksby
|
0432255d38
|
Fixing rst validation errors.
|
2023-01-08 09:32:22 +00:00 |
|
Richard Brooksby
|
df54db3110
|
Explaining prerequisite checks for build results and what to do about them.
|
2023-01-08 09:29:22 +00:00 |
|
Richard Brooksby
|
84b5d51144
|
Adding instructions for checking travis ci results. this raises the possibility of insisting on a clean trial merge before even starting this procedure.
|
2023-01-08 08:37:18 +00:00 |
|
Richard Brooksby
|
edea7ba954
|
Adding an option step to push to github promptly, and what to do if it doesn't happen automatically.
|
2023-01-08 08:19:34 +00:00 |
|
Richard Brooksby
|
96024b8153
|
Improving prerequisite wording.
|
2023-01-08 00:12:43 +00:00 |
|
Richard Brooksby
|
326745f767
|
Comments become rationale in late-night rant.
|
2023-01-07 23:48:24 +00:00 |
|
Richard Brooksby
|
36fd76ad28
|
Fixing link markup.
|
2023-01-07 23:11:55 +00:00 |
|
Richard Brooksby
|
7502a2b95d
|
Adding a step to create a "social lock" on the perforce masters to avoid a race.
|
2023-01-07 23:03:28 +00:00 |
|
Richard Brooksby
|
ea0a60ebe9
|
Clear temporal separation of prerequisite steps. further clarification of procedure steps.
|
2023-01-07 22:58:50 +00:00 |
|
Richard Brooksby
|
b85596d3e9
|
Clarifying pre-merge checklist.
|
2023-01-07 22:42:15 +00:00 |
|
Richard Brooksby
|
d4f0b223bd
|
Simplifying licensing of contributions by deeming them to conform to exisitng licenses unless expressly stated otherwise in the contribution request.
|
2023-01-07 22:33:42 +00:00 |
|
Richard Brooksby
|
97275bf8ba
|
Improving rst formatting.
|
2023-01-07 22:20:45 +00:00 |
|
Richard Brooksby
|
512ba73935
|
Fixing the step for checking licensing of contributions.
|
2023-01-07 22:17:42 +00:00 |
|
Richard Brooksby
|
114ef0604b
|
Validating rst and fixing minor issues.
|
2023-01-07 20:55:56 +00:00 |
|
Richard Brooksby
|
ad69b8f6f9
|
Pnj points out that the merge button in github, doing a fast-forward, also discards information about who did this procedure, which we don't want.
|
2023-01-07 20:38:49 +00:00 |
|
Richard Brooksby
|
792cde78cd
|
Answering question about the github merge button.
|
2023-01-07 20:35:31 +00:00 |
|