<div dir="ltr">I just pushed the Tcl8.6 fixes into release-5.10.<div><br></div><div>Thanks Dean!</div><div><br></div></div><div class="gmail_extra"><br clear="all"><div>David E DeMarle<br>Kitware, Inc.<br>R&D Engineer<br>
21 Corporate Drive<br>Clifton Park, NY 12065-8662<br>Phone: 518-881-4909</div>
<br><br><div class="gmail_quote">On Mon, Oct 28, 2013 at 2:42 PM, Marcus D. Hanwell <span dir="ltr"><<a href="mailto:marcus.hanwell@kitware.com" target="_blank">marcus.hanwell@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi David,<br>
<br>
For these, you will need to supply the URLs to me or David, this is a<br>
deficiency in the Gerrit logic where it sees a matching SHA and has no<br>
understanding that it can be merged into different integration<br>
branches (they use cherry-picking). I can make sure this is merged,<br>
but it must be done manually. When you cherry-pick something, or<br>
create a new patch then it should work as expected.<br>
<br>
Thanks,<br>
<br>
Marcus<br>
<div class="HOEnZb"><div class="h5"><br>
On Mon, Oct 28, 2013 at 4:26 PM, David Gobbi <<a href="mailto:david.gobbi@gmail.com">david.gobbi@gmail.com</a>> wrote:<br>
> Hi Marcus,<br>
><br>
> I tried re-pushing the tcl 8.6 fix, which is based off of release-5.10 and<br>
> was merged into master in March. My push was rejected, with the error<br>
> "No new changes".<br>
><br>
> Here is my attempt to push, and gerrit's response:<br>
><br>
> git push gerrit HEAD:refs/for/release-5.10/release-tcl86_update<br>
> Total 0 (delta 0), reused 0 (delta 0)<br>
> To dgobbi@review.source.kitware.com:VTK<br>
> ! [remote rejected] HEAD -><br>
> refs/for/release-5.10/release-tcl86_update (No new changes)<br>
> error: failed to push some refs to 'dgobbi@review.source.kitware.com:VTK'<br>
><br>
> The topic that I am pushing is the one listed here:<br>
><br>
> <a href="http://review.source.kitware.com/#/t/2360/" target="_blank">http://review.source.kitware.com/#/t/2360/</a><br>
><br>
> What do I do with backports that have already been submitted to gerrit?<br>
> I specifically mean topics like the one above, where the backporting<br>
> has already been done and the topic is ready to be merged.<br>
><br>
> David<br>
</div></div></blockquote></div><br></div>