[Insight-developers] Gerrit Issues

[Hans Johnson]

So the process was not followed properly.

OK... Now what?

Could one of you retrospectively change the commit message to include the
correct change-ID so that these patches get moved from "open" to "merged" in
gerrit?

Thanks,
Hans


On 10/13/10 9:15 AM, "Marcus D. Hanwell" <marcus.hanwell at kitware.com> wrote:

> As Brad said, when you rebased you changed the commit hashes, and without the
> Change-Id lines in the final line of the commit message Gerrit has no way of
> resolving your rebased commits to those in its database. The rebase is not
> necessary, but if you have the Change-Id lines in there then Gerrit will still
> be able to recognize the commits.
> 
> If the Change-Id lines were not there, then you can manually run git commit --
> amend and add the Change-Id lines (copying them from the web interface - be
> careful to copy the full line to the final line of the commit message).
> 
> Marcus
> 
> On Wednesday 13 October 2010 10:01:08 Bradley Lowekamp wrote:
>> 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