[Insight-developers] Another failed to merge scenario

[Matt McCormick]

On Mon, Aug 15, 2011 at 2:58 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>
> On a gerrit-merge, why not detect the lack of a gerrit-push and prompt the
> user to ask if they really want to do the merge?
>

Here is the patch set:

http://review.source.kitware.com/#change,2474

Thanks,
Matt

>
> On Mon, Aug 15, 2011 at 2:42 PM, Matt McCormick <matt.mccormick at kitware.com>
> wrote:
>>
>> On Mon, Aug 15, 2011 at 2:18 PM, Bill Lorensen <bill.lorensen at gmail.com>
>> wrote:
>> > I push a topic to gerrit on my upstairs laptop. Kent approved it.
>> >
>> > Now I'm in my basement.
>> >
>> > git gerrit-merge
>> > gerrit-merge failure
>> > --------------------
>> >
>> > Patch not found on Gerrit.
>> >
>> > Have you pushed your patch to Gerrit for review (git gerrit-push)?
>> >
>> > ----------------------------------------------------------------
>> > First, the error message is incorrect. The topic does exist on gerrit.
>>
>> It is correct, but it could be more specific.  Patch, here, means
>> commit, or 'Patch Set' in Gerrit terms.  It does not refer to the
>> topic (Gerrit Change-Id).  There are multiple patch sets associated
>> with a Change-Id.
>>
>> Again, in a commit, the *parent commit* is also important.
>>
>> > Second, I did push my patch to gerrit (on another one of my machines).
>>
>> Where the parent commit was probably different, i.e. it was a different
>> patch.
>>
>> >
>> > I have two choices now:
>> > 1) Make a bogus change to the commit message and push to gerrit. Then I
>> > can
>> > merge. This will also force another set of robot builds.
>> > 2) Create my own alias' that use the old workflow.
>> >
>>
>> 3) git gerrit-push
>>
>> Matt
>
>