Date: prev next · Thread: first prev next last
2016 Archives by date, by thread · List index


Moin, 

Both commits have difference Change-Id tags, but I submitted them
using a single `logerrit submit master` command. Now gerrit says for
the second patch: 'Cannot Merge'. I could not find what this means,
but I suppose that the second patch without the first does not apply
cleanly on master (which is correct, they are dependent). 

Yeah, this is exactly what happens if patch2 depends on patch1 which has not 
been merged to master yet.

Once patch1 gets merged, evil 'Cannot Merge' tag at patch2 automatically 
disappears.
 
(unless it doesn't, and that means someone else has committed changes to the 
same chunk of code in the meantime and your patch no longer applies, but let's 
deal with that only when such situation arises) 

What is the correct way to submit a patch series to gerrit? I'd like
to avoid squashing all patches into one commit, but there also has to
be a way for reviewers to see that all patches in a series are
related.

Yours is the correct way, the reviewers are well aware of false merge conflicts 
of dependent patches. I'm still not sure if this is a gerrit bug or some 
sophisticated feature *grin*
-- 

Katarina Behrens

Softwareentwicklerin LibreOffice
–––
CIB software GmbH
Geschäftsstelle Hamburg
Flachsland 10
22083 Hamburg
–––
T +49 (40) / 28 48 42 -235
F +49 (40) / 28 48 42 -100

Katarina.Behrens@cib.de
www.cib.de
–––
Sitz: München
Registergericht München, HRB 123286
Geschäftsführer: Dipl.-Ing. Ulrich Brandner

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.