2016-08-30 16:41 GMT+02:00 Eike Rathke <erack@redhat.com>:
Great, we'll welcome your patches for review on gerrit :-)
I have a question regarding the patch submission on gerrit.
In searching for a faster way to implement
SheetDataBuffer::addColXfStyle (for tdf#100709), I noticed that the
current implementation had some bugs too. To keep it clean, I split up
the work into 2 commits: one for the bugfix (which changes the
imported file) and one for the performance fix (without any output
change).
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). But oddly
enough Jenkins can build the second patch, so I gues Jenkins does use
both patches for building.
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.
Maarten
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.