Skip to content

Change references of 'pu' to 'seen' #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Change references of 'pu' to 'seen' #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d76cf
Change references to Git project's 'pu' branch to 'seen'
sivaraam Jul 4, 2020
cd4832c
Change reference of 'pu' to 'seen' in the SVG image
sivaraam Jul 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions book/05-distributed-git/sections/maintaining.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ Then, when the codebase on that branch is stable and passes tests, you merge it
===== Large-Merging Workflows

(((workflows, "merging (large)")))
The Git project has four long-running branches: `master`, `next`, and `pu` (proposed updates) for new work, and `maint` for maintenance backports.
The Git project has four long-running branches: `master`, `next`, and `seen` (formerly 'pu' -- proposed updates) for new work, and `maint` for maintenance backports.
When new work is introduced by contributors, it's collected into topic branches in the maintainer's repository in a manner similar to what we've described (see <<merwf_f>>).
At this point, the topics are evaluated to determine whether they're safe and ready for consumption or whether they need more work.
If they're safe, they're merged into `next`, and that branch is pushed up so everyone can try the topics integrated together.
Expand All @@ -352,10 +352,10 @@ If they're safe, they're merged into `next`, and that branch is pushed up so eve
.Managing a complex series of parallel contributed topic branches
image::images/large-merges-1.png[Managing a complex series of parallel contributed topic branches]

If the topics still need work, they're merged into `pu` instead.
If the topics still need work, they're merged into `seen` instead.
When it's determined that they're totally stable, the topics are re-merged into `master`.
The `next` and `pu` branches are then rebuilt from the `master`.
This means `master` almost always moves forward, `next` is rebased occasionally, and `pu` is rebased even more often:
The `next` and `seen` branches are then rebuilt from the `master`.
This means `master` almost always moves forward, `next` is rebased occasionally, and `seen` is rebased even more often:

.Merging contributed topic branches into long-term integration branches
image::images/large-merges-2.png[Merging contributed topic branches into long-term integration branches]
Expand Down
2 changes: 1 addition & 1 deletion images/large-merges-2.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.