[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-kimageshop
Subject: Re: Merge Service still in use?
From: Ben Cooksley <bcooksley () kde ! org>
Date: 2023-12-19 9:55:46
Message-ID: CA+XidOGSKw55OknejaCu9wzQ7Ep2tsYev32_EF5-R1NVmeYY4A () mail ! gmail ! com
[Download RAW message or body]
On Tue, Dec 19, 2023 at 10:47 PM Dmitry Kazakov <dimula73@gmail.com> wrote:
> The main problem for me is that I want to have the patch merged asap, to
> be able to test/resolve issues of some other patches in combination with
> this one. That's why I just merge that without rebase-pipeline completion.
>
> Speaking truly, I'm not very happy with our 'always fast-forward merge'
> policy [0], but given GitLab doesn't provide an option to switch policy
> on-the-fly, it should be fine for now.
>
That global policy is in place for good reason - and not only because
people want a clean history.
It is also there because merge commits cannot be easily reverted and you do
not want to try reverting a merge commit (it ends very very badly - we've
had to force push repositories out of that mess before)
Cheers,
Ben
>
> [0] - this policy is good for small patches, but for bigger patchset I
> would prefer to see an explicit merge commit
>
> On Tue, Dec 19, 2023 at 10:25 AM Ben Cooksley <bcooksley@kde.org> wrote:
>
>> On Tue, Dec 19, 2023 at 10:16 PM Dmitry Kazakov <dimula73@gmail.com>
>> wrote:
>>
>>> Hi, Ben!
>>>
>>> I think we have kind of forgotten about that. I usually build the MRs
>>> locally or check if the pipeline has succeeded for the current revision,
>>> then I just "rebase without pipeline" and do the merge. It might be that I
>>> should use the merge service for that, I'm not sure...
>>>
>>
>> That is fine. Given it doesn't seem to be too well loved i'm going to
>> decommission the service.
>>
>> The initial issues we had with it's reliability had been resolved however
>> I think that happened not too long before people stopped using it.
>>
>> Cheers,
>> Ben
>>
>>
>>>
>>> On Sat, Dec 16, 2023 at 2:41 AM Ben Cooksley <bcooksley@kde.org> wrote:
>>>
>>>> Hi all,
>>>>
>>>> I've just been reviewing services we're looking after and while doing
>>>> so have noticed that Marge Bot (invent.kde.org/merge-service) doesn't
>>>> seem to have done anything for 4 months.
>>>>
>>>> As the two projects with it enabled, is this something you're still
>>>> using as it doesn't look like it.
>>>>
>>>> Thanks,
>>>> Ben
>>>>
>>>
>>>
>>> --
>>> Dmitry Kazakov
>>>
>>
>
> --
> Dmitry Kazakov
>
[Attachment #3 (text/html)]
<div dir="ltr"><div dir="ltr">On Tue, Dec 19, 2023 at 10:47 PM Dmitry Kazakov \
<<a href="mailto:dimula73@gmail.com">dimula73@gmail.com</a>> \
wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr">The main problem for me is that I \
want to have the patch merged asap, to be able to test/resolve issues of some other \
patches in combination with this one. That's why I just merge that without \
rebase-pipeline completion.<div><br></div><div>Speaking truly, I'm not very happy \
with our 'always fast-forward merge' policy [0], but given GitLab doesn't \
provide an option to switch policy on-the-fly, it should be fine for \
now.</div></div></blockquote><div><br></div><div>That global policy is in place for \
good reason - and not only because people want a clean history.</div><div>It is also \
there because merge commits cannot be easily reverted and you do not want to try \
reverting a merge commit (it ends very very badly - we've had to force push \
repositories out of that mess \
before)</div><div><br></div><div>Cheers,</div><div>Ben</div><div> </div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><br></div><div>[0] - this \
policy is good for small patches, but for bigger patchset I would prefer to see an \
explicit merge commit</div></div><br><div class="gmail_quote"><div dir="ltr" \
class="gmail_attr">On Tue, Dec 19, 2023 at 10:25 AM Ben Cooksley <<a \
href="mailto:bcooksley@kde.org" target="_blank">bcooksley@kde.org</a>> \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div \
dir="ltr">On Tue, Dec 19, 2023 at 10:16 PM Dmitry Kazakov <<a \
href="mailto:dimula73@gmail.com" target="_blank">dimula73@gmail.com</a>> \
wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi, Ben!<div><br></div><div>I think \
we have kind of forgotten about that. I usually build the MRs locally or check if the \
pipeline has succeeded for the current revision, then I just "rebase without \
pipeline" and do the merge. It might be that I should use the merge service for \
that, I'm not sure...</div></div></blockquote><div><br></div><div>That is fine. \
Given it doesn't seem to be too well loved i'm going to decommission the \
service. </div><div><br></div><div>The initial issues we had with it's \
reliability had been resolved however I think that happened not too long before \
people stopped using \
it.</div><div><br></div><div>Cheers,</div><div>Ben</div><div><br></div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div><br></div></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, Dec 16, 2023 at \
2:41 AM Ben Cooksley <<a href="mailto:bcooksley@kde.org" \
target="_blank">bcooksley@kde.org</a>> wrote:<br></div><blockquote \
class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi all,<div><br></div><div>I've \
just been reviewing services we're looking after and while doing so have noticed \
that Marge Bot (<a href="http://invent.kde.org/merge-service" \
target="_blank">invent.kde.org/merge-service</a>) doesn't seem to have done \
anything for 4 months.</div><div><br></div><div>As the two projects with it enabled, \
is this something you're still using as it doesn't look like \
it.</div><div><br></div><div>Thanks,</div><div>Ben</div></div> </blockquote></div><br \
clear="all"><div><br></div><span class="gmail_signature_prefix">-- </span><br><div \
dir="ltr" class="gmail_signature">Dmitry Kazakov</div> </blockquote></div></div>
</blockquote></div><br clear="all"><div><br></div><span \
class="gmail_signature_prefix">-- </span><br><div dir="ltr" \
class="gmail_signature">Dmitry Kazakov</div> </blockquote></div></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic