[Insight-developers] Failed to merge a gerrit patch

[Bill Lorensen]

I cannot do a push after the cherry pick because gerrit reports that nothing
has changed.

I can do a commit -amend and add a bogus change to the commit message and
then successfully push. I can live with this, but it is a change from the
previous work flow. I avoid the checkout line because it often rebuilds too
much stuff.

Actually, I would prefer that the recent commit check be removed. I realize
that it was adeed to prevent a bogur gerrit-merge, but I question how often
that happened.

Bill

On Sun, Aug 14, 2011 at 5:35 PM, Matt McCormick
<matt.mccormick at kitware.com>wrote:

> >
> > Please tell me what you do when you want to merge a gerrit topic that is
> not
> > yours.
>
> Either just use the checkout line from gerrit, or do a gerrit-push
> after the cherry-pick.
>
> Thanks,
> Matt
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110814/da583c50/attachment.htm>