[Insight-developers] git/gerrit issue (many garbage merge patches showing up in gerrit)

[Gaëtan Lehmann]

Tom,

I think you've pulled from master in your branch many times. You are  
getting one merge patch per pull.

To fix that, I would:

- create a new branch based on the current master
- cherry pick the change from the gerrit in that new branch (see the  
cherry pick tab in gerrit)
- push the result to gerrit with gerrit-push
- manually abandon all the other patches in gerrit

Regards,

Gaëtan


Le 3 juin 11 à 15:05, Tom Vercauteren a écrit :

> Typo in the previous message...
>
> On Fri, Jun 3, 2011 at 14:50, Tom Vercauteren  
> <tom.vercauteren at m4x.org> wrote:
>> Hi all,
>>
>> Sorry for the mess, I haven't really caught up with gerrit and git
>> yet. I tried to submit a patch to gerrit for the following bug:
>>  http://www.itk.org/Bug/view.php?id=12239
>>
>> I approximatively followed the instructions here
>>  http://www.itk.org/Wiki/ITK/Gerrit/Primer
>> but it ended up with a lot of garbage gerrit entries:
>>  http://review.source.kitware.com/
>> e.g.
>>  http://review.source.kitware.com/#change,1782
>>
>> I have absolutely no clue what I did wrong or how to fix it...
>>
>> Anyhow, the relevant patch is here is someone is willing to look at  
>> it:
>>  http://review.source.kitware.com/#change,1781
>
> Sorry, I meant
>  http://review.source.kitware.com/#change,1819
>
> Tom
> _______________________________________________
> 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

-- 
Gaëtan Lehmann
Biologie du Développement et de la Reproduction
INRA de Jouy-en-Josas (France)
tel: +33 1 34 65 29 66    fax: 01 34 65 29 09
http://voxel.jouy.inra.fr  http://www.itk.org
http://www.mandriva.org  http://www.bepo.fr