Bug 12100 - add rocko branch to yocto-docs
Summary: add rocko branch to yocto-docs
Status: RESOLVED FIXED
Alias: None
Product: General Docs
Classification: Documentation
Component: docs-general (show other bugs)
Version: 2.4
Hardware: x86 Multiple
: High normal
Target Milestone: 2.4 M4
Assignee: Richard Purdie
QA Contact:
URL:
Whiteboard: 21 Sept 2017: RESOLVED
Depends on:
Blocks:
 
Reported: 2017-09-18 20:29 UTC by brian avery
Modified: 2017-09-21 16:23 UTC (History)
2 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: ---
Verified:
Documentation change: Done (doc changes complete)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description brian avery 2017-09-18 20:29:01 UTC
This branch is needed in order to build the Eclipse plugin or else the build will fail when it tries to switch to origin/rocko for yocto-docs.
The repo in question:
http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/
Comment 1 Scott Rifenbark 2017-09-21 00:08:20 UTC
Brian, 

I don't get this Brian...  Should I tag the commit in the repo now that to coincide with the commit last used by the engineers when 2.4 M4 froze, which I think was the 19th of September?  Problem is there are tons of doc changes yet to be pushed that have to do with 2.4.  I usually have that extra month after the M4 freeze to continue working.

For past releases, I have not tagged the yocto-docs repo until the release happens.  That way if someone checks out yocto-docs on that release, they get a more realistic set of files for the release.  Development of the code usually locks down too early for me.  

I will get this tagged soon. 

Thanks, 
Scott
Comment 2 Richard Purdie 2017-09-21 15:59:23 UTC
What Brian needs is a rocko branch in the yocto-docs repo. I've created this based on master, it can just track master until the docs diverge between rocko and 2.5.

We can continue to add changes to master and rocko, just keeping them updated in parallel ("git push origin master:rocko" updates the rocko branch with master's changes.
Comment 3 Scott Rifenbark 2017-09-21 16:23:47 UTC
Richard, 

Thanks for tagging it.  I could have done that but was unsure of whether or not to do it.  Thanks for the instruction on Git as well to keep both branches in sync for the time being. 

Scott