[Insight-developers] Gerrit Issues

[Bradley Lowekamp]

Hans,

It looks like the original patches didn't contain the Change-Id magic, so Gerrit couldn't track them after your rebase. Your environment automatically added a Change-Id which was different then the original patch. Your additional step of "git rebase origin/master"  I believe is what caused the commit to change, because it is rebasing. I don't believe that this step is necessary, unless the topic stage merge fails.

As in your first case were you got a conflict, when you need to modify the patch care must be taken to make sure the correct change-ID is in the message when it was not in the initial patch.

Brad


On Oct 13, 2010, at 7:08 AM, Hans Johnson 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
> <ATT00001..txt>

========================================================
Bradley Lowekamp  
Lockheed Martin Contractor for
Office of High Performance Computing and Communications
National Library of Medicine 
blowekamp at mail.nih.gov


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20101013/ecc1e077/attachment.htm>