Project

Profile

Help

Task #84

Document our branching strategy in more detail

Added by rbarlow almost 7 years ago. Updated 4 months ago.

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

100%

Estimated time:
Platform Release:
2.7.1
Groomed:
No
Sprint Candidate:
No
Tags:
Documentation, Pulp 2
Sprint:
January 2015
Quarter:

Description

Our branching strategy is documented, but it could be done better. In particular, it doesn't give very clear instructions about how to merge forward fixes, or how to know which branches should contain a fix. We need to document:

  • No version's -dev branch should be merged to another versions -testing branch (I think this happens often currently). I.e., 2.4-dev should not ever be merged into 2.5-testing.
  • If a PR needs to be merged to more than one -testing branch, it should be merged to each directly as opposed to merging to 2.4-testing --> 2.4-dev --> 2.5-testing (ooops!)
  • How can we use Redmine (potentially with custom fields) to help us keep track of this?

It is also worth considering whether we can automate any of this.

Associated revisions

Revision 84e9da1a View on GitHub
Added by cduryee almost 7 years ago

closes #84 Updates to merge process

This patch is an update to make the merge process more clear. It also adds a diagram with a typical merge scenario and adds some tips for using redmine.

Some rst fixes to other docs are in this patch as well.

Revision 84e9da1a View on GitHub
Added by cduryee almost 7 years ago

closes #84 Updates to merge process

This patch is an update to make the merge process more clear. It also adds a diagram with a typical merge scenario and adds some tips for using redmine.

Some rst fixes to other docs are in this patch as well.

Revision 34e8ade8 View on GitHub
Added by cduryee over 6 years ago

Merge pull request #1520 from beav/mergedoc

closes #84 Updates to merge process

Revision 34e8ade8 View on GitHub
Added by cduryee over 6 years ago

Merge pull request #1520 from beav/mergedoc

closes #84 Updates to merge process

History

#1 Updated by cduryee almost 7 years ago

  • Sprint/Milestone set to 9

#2 Updated by cduryee almost 7 years ago

  • Status changed from NEW to ASSIGNED

#3 Updated by cduryee almost 7 years ago

  • Assignee set to cduryee

#4 Updated by cduryee almost 7 years ago

  • % Done changed from 0 to 30

#5 Updated by cduryee almost 7 years ago

This task also includes adding a "target release" field to redmine issues.

#6 Updated by cduryee almost 7 years ago

  • % Done changed from 30 to 90

#8 Updated by cduryee over 6 years ago

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

#9 Updated by cduryee over 6 years ago

Applied in changeset pulp|commit:84e9da1acaf830f8cbce02e28f8f6a70fb09e06d.

#10 Updated by cduryee over 6 years ago

Applied in changeset pulp|commit:34e8ade84452ad23e1a21da43cd828bb61e5adcb.

#11 Updated by bmbouter over 6 years ago

  • Category deleted (1)
  • Tags Documentation added

Documentation is now a Tag not a Category.

#12 Updated by rbarlow over 5 years ago

  • Status changed from MODIFIED to CLOSED - CURRENTRELEASE
  • Platform Release set to 2.7.1

#13 Updated by bmbouter over 3 years ago

  • Sprint set to January 2015

#14 Updated by bmbouter over 3 years ago

  • Sprint/Milestone deleted (9)

#15 Updated by bmbouter over 2 years ago

  • Tags Pulp 2 added

Please register to edit this issue

Also available in: Atom PDF