[vtk-developers] Gerrit release-5.10 branch now open for backported fixes

[Marcus D. Hanwell]

Hi David,

For these, you will need to supply the URLs to me or David, this is a
deficiency in the Gerrit logic where it sees a matching SHA and has no
understanding that it can be merged into different integration
branches (they use cherry-picking). I can make sure this is merged,
but it must be done manually. When you cherry-pick something, or
create a new patch then it should work as expected.

Thanks,

Marcus

On Mon, Oct 28, 2013 at 4:26 PM, David Gobbi <david.gobbi at gmail.com> wrote:
> Hi Marcus,
>
> I tried re-pushing the tcl 8.6 fix, which is based off of release-5.10 and
> was merged into master in March.  My push was rejected, with the error
> "No new changes".
>
> Here is my attempt to push, and gerrit's response:
>
> git push gerrit HEAD:refs/for/release-5.10/release-tcl86_update
> Total 0 (delta 0), reused 0 (delta 0)
> To dgobbi at review.source.kitware.com:VTK
>  ! [remote rejected] HEAD ->
> refs/for/release-5.10/release-tcl86_update (No new changes)
> error: failed to push some refs to 'dgobbi at review.source.kitware.com:VTK'
>
> The topic that I am pushing is the one listed here:
>
> http://review.source.kitware.com/#/t/2360/
>
> What do I do with backports that have already been submitted to gerrit?
> I specifically mean topics like the one above, where the backporting
> has already been done and the topic is ready to be merged.
>
>   David