Project

Profile

Help

Task #1311

Update docs and communicate to community the new branching strategy

Added by dkliban@redhat.com about 6 years ago. Updated over 2 years ago.

Status:
CLOSED - CURRENTRELEASE
Priority:
Normal
Category:
-
Sprint/Milestone:
-
Start date:
Due date:
% Done:

100%

Estimated time:
Platform Release:
2.8.0
Groomed:
No
Sprint Candidate:
No
Tags:
Documentation, Pulp 2
Sprint:
Quarter:

Description

Update the docs [0] to reflect the change in branching strategy that we had discussed. Here is the summary:

Each X.Y release will have one branch. Perhaps we call it X.Y-dev to be consistent with current naming. 
All work for the X.Y stream will be merged to this branch.

Beta, RC, and GA releases will be represented as tags only.

When it is time to do a beta release, the current tip of X.Y-dev will be tagged and built. If a beta or RC
fails testing, appropriate fixes are applied to X.Y-dev, and a new build can be made. Any additional fixes
not blocking the previous beta, which happen to have been merged to X.Y-dev since the previous build,
*will be included*. Betas are no longer frozen to just blocking fixes.

Hotfix: If an important hotfix must go out quickly, a branch will be created from the previous Z release tag.
The fix will be made (via PR from a personal fork to the hotfix branch), a new tag will be built from the tip
of the hotfix branch, and the hotfix branch can be merged to X.Y-dev.

Merging a PR forward is only required once per X.Y release, and we can guarantee that X.(Y-1) is always
fully merged into X.Y. This should be about as easy as merging could be. Example: I fix a bug in 2.7-dev. I
know it will land in the next 2.7 build, but I don't need to care which. I merge my change to 2.8-dev if it
exists, and master. 2.7-dev is guaranteed to already be fully merged into 2.8-dev and master, so the merge
should be uneventful.

Once the documentation is updated, an email needs to be sent out to the pulp-list with [devel] tag in subject. The email should explain that there has been a change in the branching strategy and point readers to the newly updated documentation.

[0] - http://pulp.readthedocs.org/en/latest/dev-guide/contributing/branching.html

Associated revisions

Revision 080ab0f6 View on GitHub
Added by mhrivnak almost 6 years ago

describing our new branching and merging strategy

re #1311

Revision 080ab0f6 View on GitHub
Added by mhrivnak almost 6 years ago

describing our new branching and merging strategy

re #1311

History

#1 Updated by dkliban@redhat.com about 6 years ago

  • Description updated (diff)

#2 Updated by mhrivnak about 6 years ago

  • Status changed from NEW to ASSIGNED
  • Assignee set to mhrivnak

#3 Updated by mhrivnak about 6 years ago

https://github.com/pulp/pulp/pull/2122

I'm leaving this as assigned, because an additional PR will be required to update the build documentation.

#4 Updated by dkliban@redhat.com almost 6 years ago

  • Assignee changed from mhrivnak to dkliban@redhat.com

#5 Updated by dkliban@redhat.com almost 6 years ago

  • Status changed from ASSIGNED to MODIFIED
  • % Done changed from 0 to 100

#6 Updated by rbarlow over 5 years ago

  • Status changed from MODIFIED to 5
  • Platform Release set to 2.8.0

#7 Updated by dkliban@redhat.com over 5 years ago

  • Status changed from 5 to CLOSED - CURRENTRELEASE

#8 Updated by bmbouter over 2 years ago

  • Tags Pulp 2 added

Please register to edit this issue

Also available in: Atom PDF