All,
Recently the Continuous Integration system (ie. Jenkins and associated build
scripts) were overhauled to bring down the build times. At its worst, the
builds were taking approximately 1 hour 40 minutes to verify a changeset. The
overhaul has brought verification times down to just 25-30 minutes. Because of
the nature of branching out a sequential build process to a parallel build
process in Jenkins, and with our setup with Gerrit verifications, all pending
work for master will need to be rebased onto latest master.
In most cases, the following commands will rebase your work locally (you may
replace "<my_parent_branch>" with "master" if you're working on top of master:
Do this if you don't already have a local branch for your work:
git checkout -b <my_branch_name>
git checkout <my_parent_branch>
git pull
git checkout <my_branch_name>
git rebase -onto <my_parent_branch> HEAD^
Do this if you would like to update your Gerrit changeset with the rebase:
git push origin HEAD:refs/for/<my_parent_branch>
Do this if you don't keep local branches for your work (not advised):
git branch -D <my_branch_name>
Alternatively, if your changeset is just on Gerrit and it is already ready to
be merged into master (and no new modifications need to be made to your
changeset), you may simply click on "rebase" on the dashboard webpage for your
Gerrit Changeset.
For general Git & Gerrit questions please refer to the IoTivity wiki, or try
researching via Google.
Thanks,
Joey Morrow
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20150722/044a1473/attachment.html>
