Hi Trafodion Developers,
This is just a reminder that tomorrow, Friday, July 11 (got the day of the week
right this time), the Infrastructure team will be creating a proposed release
candidate branch for the July release.
For many of you, it will be business as usual. You'll continue to develop code
changes against the master branch as you have.
But, if you are one of the lucky ones who has to make a fix on the proposed
branch, here's some information for you (courtesy of Steve Varnau and Faye
Brackett). These side branches are named proposed/<release-name>. As an
example, tomorrow's branch will be named proposed/0.8.3.
To submit changes to Proposed-Release Branches, do the following:
* git checkout -b <task-name> gerrit/proposed/0.8.3
o If you get an error finding that branch, do "git fetch --all" and try
again.
* Make changes and commit as normal.
* If you are porting a change from master branch, do "git cherry-pick
<commit>"
* git review proposed/0.8.3
o If you get a prompt like:
You have more than one commit that you are about to submit.
The outstanding commits are:
...
Is this really what you meant to do?
Type 'yes' to confirm: no
It most likely means your task branch is not based on the right
thing. Be sure to type "no". Get some help from the Infrastructure team to
rebase your branch to the right context.
To port a change from the Release Branch to Master, do the following:
* git checkout -b <task-name> gerrit/master
* git cherry-pick <commit>
o If you have the change on another task branch, just use that branch
name for the <commit>.
o If you have conflicts to resolve, edit the files, then use "git add
<file>..." and "git commit".
o You can use git commit --amend if needed.
* git review
You can certainly submit in either order -- master first or proposed branch
first, and use cherry-pick to port the change.
In case you're interested, here's the process for creating the proposed branch.
Tonight's build will be picked up by the QA team, who will have a go at it.
Assuming it looks good to them, they give the OK to the Infrastructure team,
who create the branch in git from the point of that build. (Developers could
have added more changes to the master branch in the meantime; this is normal
and expected but those changes won't be picked up in this branch.)
Happy Developing!
Dave
--
Mailing list: https://launchpad.net/~trafodion-development
Post to : [email protected]
Unsubscribe : https://launchpad.net/~trafodion-development
More help : https://help.launchpad.net/ListHelp
