[Insight-developers] Failed to merge a gerrit patch

[Bill Lorensen]

Well, something has changed. I have been doing a
git checkout -b topic
cherry pick
git gerrit-merge

for quite a while. And this no longer works.

Please tell me what you do when you want to merge a gerrit topic that is not
yours.

Bill

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

> If the patch is unmodified, it will not happen.
>
> If you are doing a cherry-pick from master, the patch has a different
> parent, and it is considered modified.
>
> Thanks,
> Matt
>
> On Sun, Aug 14, 2011 at 4:24 PM, Bill Lorensen <bill.lorensen at gmail.com>
> wrote:
> > It happened again...
> >
> >
> > [ITKGerrit(master)] git checkout -b repeatedValgrind
> > Switched to a new branch 'repeatedValgrind'
> > [ITKGerrit(repeatedValgrind)] git fetch
> > http://review.source.kitware.com/p/ITK refs/changes/60/2460/3 && git
> > cherry-pick FETCH_HEAD
> > remote: Counting objects: 9, done
> > remote: Finding sources: 100% (5/5)
> > remote: Total 5 (delta 4), reused 5 (delta 4)
> > Unpacking objects: 100% (5/5), done.
> > From http://review.source.kitware.com/p/ITK
> >  * branch            refs/changes/60/2460/3 -> FETCH_HEAD
> > [repeatedValgrind edfa284] BUG: Fix runValgrind.sh on multiple runs.
> >  Author: Matt McCormick <matt.mccormick at kitware.com>
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > [ITKGerrit(repeatedValgrind)] git gerrit-merge
> > gerrit-merge failure
> > --------------------
> >
> > Patch not found on Gerrit.
> >
> > Have you pushed your patch to Gerrit for review (git gerrit-push)?
> >
> >
> > n Sun, Aug 14, 2011 at 4:22 PM, Bill Lorensen <bill.lorensen at gmail.com>
> > wrote:
> >>
> >> I think not.
> >>
> >> In the past, I was able to do a:
> >>
> >> git checkout -b atopic
> >> git gerrit-merge
> >>
> >> even if it was not my topic. In other words, I never did a gerrit-push
> on
> >> the topic since it was someone elses.
> >>
> >> Maybe I  messed up something else.
> >>
> >> If it happens again, I'll let you know.
> >>
> >>
> >>
> >> On Sun, Aug 14, 2011 at 3:59 PM, Matt McCormick
> >> <matt.mccormick at kitware.com> wrote:
> >>>
> >>> Hi Bill,
> >>>
> >>> This is intended behavior.  A 'git commit --amend' or a 'git rebase
> >>> master' will require a 'git gerrit-push' before a 'git gerrit-merge'
> >>> because they are no longer the same commit.
> >>>
> >>> Thanks,
> >>> Matt
> >>>
> >>> On Sun, Aug 14, 2011 at 3:53 PM, Bill Lorensen <
> bill.lorensen at gmail.com>
> >>> wrote:
> >>> > This was a topic that was not mine.
> >>> >
> >>> > OK, so I did a git commit --amend and changed the commit message.
> >>> >
> >>> > I did a gerrit-push, followed by a gerrit-merge and it worked.
> >>> >
> >>> > I think there may be a flaw in the recently added git hooks.
> >>> >
> >>> > Bill
> >>> >
> >>> >
> >>> > On Sun, Aug 14, 2011 at 3:50 PM, Bill Lorensen
> >>> > <bill.lorensen at gmail.com>
> >>> > wrote:
> >>> >>
> >>> >> I tried to merge a gerrit patch today and got the error:
> >>> >>
> >>> >> gerrit-merge failure
> >>> >> --------------------
> >>> >>
> >>> >> Patch not found on Gerrit.
> >>> >>
> >>> >> Have you pushed your patch to Gerrit for review (git gerrit-push)?
> >>> >>
> >>> >> This is the topic:
> >>> >> http://review.source.kitware.com/#change,2464
> >>> >>
> >>> >> Bill
> >>> >>
> >>> >
> >>> >
> >>> > _______________________________________________
> >>> > Powered by www.kitware.com
> >>> >
> >>> > Visit other Kitware open-source projects at
> >>> > http://www.kitware.com/opensource/opensource.html
> >>> >
> >>> > Kitware offers ITK Training Courses, for more information visit:
> >>> > http://kitware.com/products/protraining.html
> >>> >
> >>> > Please keep messages on-topic and check the ITK FAQ at:
> >>> > http://www.itk.org/Wiki/ITK_FAQ
> >>> >
> >>> > Follow this link to subscribe/unsubscribe:
> >>> > http://www.itk.org/mailman/listinfo/insight-developers
> >>> >
> >>> >
> >>
> >
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110814/e3445738/attachment.htm>