[Insight-developers] Gerrit Issues
Luis Ibanez
luis.ibanez at kitware.com
Wed Oct 13 09:44:19 EDT 2010
Hi Hans,
Thanks for helping to clear the Gerrit backlog.
Here is what is see now:
1) The (Remove_ITK_USE_TEMPLATE_META_PROGRAMMING_LOOP_UNROLLING)<http://review.source.kitware.com/#q,status:merged+project:ITK+branch:master+topic:Remove_ITK_USE_TEMPLATE_META_PROGRAMMING_LOOP_UNROLLING,n,z>
appears as merged now. (I'm not sure if Brad had to do something for
this to be updated
in Gerrit).
2) This one master
(QE-Coming-Out-Of-Review)<http://review.source.kitware.com/#q,status:merged+project:ITK+branch:master+topic:QE-Coming-Out-Of-Review,n,z>
also appears as merged now.
3) This one: master
(TransformMeshRuntimeWarning)<http://review.source.kitware.com/#q,status:open+project:ITK+branch:master+topic:TransformMeshRuntimeWarning,n,z>
does not appear as merged yet.
From you email, I understand that you pushed it to stage. Is that right
?
4) About the "GerritPrimer" patch. I don't find it in the list.
Let's discuss this during our meeting at 11am.
Marcus will be there and he may help us understand
what is happening behind the scene. Particularly the
mechanism used to inform Gerrit when something is
merged into the stage and subsequently merged into
master.
Thanks
Luis
-------------------------------------
On Wed, Oct 13, 2010 at 7:08 AM, Hans Johnson <hans-johnson at uiowa.edu>wrote:
> Brad,
>
> I merged two branches from Gerrit last night, but they are still listed as
> open on the web page.
>
> ====Needed to be merged (OK)
> git checkout master
> git pull --rebase
> git fetch http://review.source.kitware.com/p/ITK refs/changes/14/114/1 &&
> git checkout FETCH_HEAD -b
> Remove_ITK_USE_TEMPLATE_META_PROGRAMMING_LOOP_UNROLLING
> git checkout Remove_ITK_USE_TEMPLATE_META_PROGRAMMING_LOOP_UNROLLING
> git rebase origin/master
> <<< Fixed conflicts >>>
> git push gerrit 5628c1ebd3e561e515e17736168e9efdbc4ed48d:refs/changes/114
> git push stage HEAD
> ssh git at itk.org stage ITK print
> ssh git at itk.org stage ITK merge
> Remove_ITK_USE_TEMPLATE_META_PROGRAMMING_LOOP_UNROLLING
>
> ====This had already been pushed to the stage area, so I just merged it:
> (OK)
> ssh git at itk.org stage ITK merge QE-Coming-Out-Of-Review
>
> *****=====Long standing gerrit approved patches, just needed merging,
> ***Still listed on gerrit web site as open
> git checkout master
> git pull --rebase
> git fetch http://review.source.kitware.com/p/ITK refs/changes/75/75/1 &&
> git checkout FETCH_HEAD -b GerritPrimer
> git rebase origin/master
> git push stage HEAD
> ssh git at itk.org stage ITK print
> ssh git at itk.org stage ITK merge GerritPrimer
>
> *****=====gerrit approved patches, just needed merging, ***Still listed on
> gerrit web site as open
> git checkout master
> git pull --rebase
> git fetch http://review.source.kitware.com/p/ITK refs/changes/13/113/2 &&
> git checkout FETCH_HEAD -b TransformMeshRuntimeWarning
> git rebase origin/master
> git push stage HEAD
> ssh git at itk.org stage ITK print
> ssh git at itk.org stage ITK merge TransformMeshRuntimeWarning
>
>
> Did I do something wrong?
>
> Hans
> --
> Hans J. Johnson, Ph.D.
> Assistant Professor
> 200 Hawkins Drive
> T205 BT, The University of Iowa
> Iowa City, IA 52242
>
> hans-johnson at uiowa.edu
> PHONE: 319 353 8587
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at
> http://www.kitware.com/opensource/opensource.html
>
> Kitware offers ITK Training Courses, for more information visit:
> http://kitware.com/products/protraining.html
>
> Please keep messages on-topic and check the ITK FAQ at:
> http://www.itk.org/Wiki/ITK_FAQ
>
> Follow this link to subscribe/unsubscribe:
> http://www.itk.org/mailman/listinfo/insight-developers
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20101013/8b5ff90c/attachment.htm>
More information about the Insight-developers
mailing list