@@ -66,7 +66,7 @@ this mailing list after each feature release is made.
6666 demonstrated to be regression free. New changes are tested
6767 in 'next' before merged to 'master'.
6868
69- - 'pu ' branch is used to publish other proposed changes that do
69+ - 'seen ' branch is used to publish other proposed changes that do
7070 not yet pass the criteria set for 'next'.
7171
7272 - The tips of 'master' and 'maint' branches will not be rewound to
@@ -76,7 +76,7 @@ this mailing list after each feature release is made.
7676 of the cycle.
7777
7878 - Usually 'master' contains all of 'maint' and 'next' contains all
79- of 'master'. 'pu ' contains all the topics merged to 'next', but
79+ of 'master'. 'seen ' contains all the topics merged to 'next', but
8080 is rebuilt directly on 'master'.
8181
8282 - The tip of 'master' is meant to be more stable than any
@@ -229,12 +229,12 @@ by doing the following:
229229 series?)
230230
231231 - Prepare 'jch' branch, which is used to represent somewhere
232- between 'master' and 'pu ' and often is slightly ahead of 'next'.
232+ between 'master' and 'seen ' and often is slightly ahead of 'next'.
233233
234- $ Meta/Reintegrate master..pu >Meta/redo-jch.sh
234+ $ Meta/Reintegrate master..seen >Meta/redo-jch.sh
235235
236236 The result is a script that lists topics to be merged in order to
237- rebuild 'pu ' as the input to Meta/Reintegrate script. Remove
237+ rebuild 'seen ' as the input to Meta/Reintegrate script. Remove
238238 later topics that should not be in 'jch' yet. Add a line that
239239 consists of '### match next' before the name of the first topic
240240 in the output that should be in 'jch' but not in 'next' yet.
@@ -291,29 +291,29 @@ by doing the following:
291291 merged to 'master'. This may lose '### match next' marker;
292292 add it again to the appropriate place when it happens.
293293
294- - Rebuild 'pu '.
294+ - Rebuild 'seen '.
295295
296- $ Meta/Reintegrate master..pu >Meta/redo-pu .sh
296+ $ Meta/Reintegrate master..seen >Meta/redo-seen .sh
297297
298- Edit the result by adding new topics that are not still in 'pu '
298+ Edit the result by adding new topics that are not still in 'seen '
299299 in the script. Then
300300
301- $ git checkout -B pu jch
302- $ sh Meta/redo-pu .sh
301+ $ git checkout -B seen jch
302+ $ sh Meta/redo-seen .sh
303303
304- When all is well, clean up the redo-pu .sh script with
304+ When all is well, clean up the redo-seen .sh script with
305305
306- $ sh Meta/redo-pu .sh -u
306+ $ sh Meta/redo-seen .sh -u
307307
308308 Double check by running
309309
310- $ git branch --no-merged pu
310+ $ git branch --no-merged seen
311311
312312 to see there is no unexpected leftover topics.
313313
314314 At this point, build-test the result for semantic conflicts, and
315315 if there are, prepare an appropriate merge-fix first (see
316- appendix), and rebuild the 'pu ' branch from scratch, starting at
316+ appendix), and rebuild the 'seen ' branch from scratch, starting at
317317 the tip of 'jch'.
318318
319319 - Update "What's cooking" message to review the updates to
@@ -323,14 +323,14 @@ by doing the following:
323323
324324 $ Meta/cook
325325
326- This script inspects the history between master..pu , finds tips
326+ This script inspects the history between master..seen , finds tips
327327 of topic branches, compares what it found with the current
328328 contents in Meta/whats-cooking.txt, and updates that file.
329- Topics not listed in the file but are found in master..pu are
329+ Topics not listed in the file but are found in master..seen are
330330 added to the "New topics" section, topics listed in the file that
331- are no longer found in master..pu are moved to the "Graduated to
331+ are no longer found in master..seen are moved to the "Graduated to
332332 master" section, and topics whose commits changed their states
333- (e.g. used to be only in 'pu ', now merged to 'next') are updated
333+ (e.g. used to be only in 'seen ', now merged to 'next') are updated
334334 with change markers "<<" and ">>".
335335
336336 Look for lines enclosed in "<<" and ">>"; they hold contents from
@@ -360,7 +360,7 @@ Observations
360360Some observations to be made.
361361
362362 * Each topic is tested individually, and also together with other
363- topics cooking first in 'pu ', then in 'jch' and then in 'next'.
363+ topics cooking first in 'seen ', then in 'jch' and then in 'next'.
364364 Until it matures, no part of it is merged to 'master'.
365365
366366 * A topic already in 'next' can get fixes while still in
@@ -411,7 +411,7 @@ new use of the variable under its old name. When these two topics
411411are merged together, the reference to the variable newly added by
412412the latter topic will still use the old name in the result.
413413
414- The Meta/Reintegrate script that is used by redo-jch and redo-pu
414+ The Meta/Reintegrate script that is used by redo-jch and redo-seen
415415scripts implements a crude but usable way to work this issue around.
416416When the script merges branch $X, it checks if "refs/merge-fix/$X"
417417exists, and if so, the effect of it is squashed into the result of
@@ -431,14 +431,14 @@ commit that can be squashed into a result of mechanical merge to
431431correct semantic conflicts.
432432
433433After finding that the result of merging branch "ai/topic" to an
434- integration branch had such a semantic conflict, say pu ~4, check the
434+ integration branch had such a semantic conflict, say seen ~4, check the
435435problematic merge out on a detached HEAD, edit the working tree to
436436fix the semantic conflict, and make a separate commit to record the
437437fix-up:
438438
439- $ git checkout pu ~4
439+ $ git checkout seen ~4
440440 $ git show -s --pretty=%s ;# double check
441- Merge branch 'ai/topic' to pu
441+ Merge branch 'ai/topic' to seen
442442 $ edit
443443 $ git commit -m 'merge-fix/ai/topic' -a
444444
@@ -450,9 +450,9 @@ result:
450450Then double check the result by asking Meta/Reintegrate to redo the
451451merge:
452452
453- $ git checkout pu ~5 ;# the parent of the problem merge
453+ $ git checkout seen ~5 ;# the parent of the problem merge
454454 $ echo ai/topic | Meta/Reintegrate
455- $ git diff pu ~4
455+ $ git diff seen ~4
456456
457457This time, because you prepared refs/merge-fix/ai/topic, the
458458resulting merge should have been tweaked to include the fix for the
@@ -464,7 +464,7 @@ branch needs this merge-fix is because another branch merged earlier
464464to the integration branch changed the underlying assumption ai/topic
465465branch made (e.g. ai/topic branch added a site to refer to a
466466variable, while the other branch renamed that variable and adjusted
467- existing use sites), and if you changed redo-jch (or redo-pu ) script
467+ existing use sites), and if you changed redo-jch (or redo-seen ) script
468468to merge ai/topic branch before the other branch, then the above
469469merge-fix should not be applied while merging ai/topic, but should
470470instead be applied while merging the other branch. You would need
0 commit comments