From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: "If you're still seeing problems, please reopen." [Was: bug#25148:] Date: Wed, 20 Nov 2019 16:53:09 +0000 Message-ID: References: <20191117113054.49837.qmail@mail.muc.de> <87pnhq7mxg.fsf@gnus.org> <87bltaz9g4.fsf@telefonica.net> <834kz25qp9.fsf@gnu.org> <87y2wexsv1.fsf@telefonica.net> <83sgmm4a08.fsf@gnu.org> <87h832xqxr.fsf@telefonica.net> <20191117192558.GC11551@ACM> <87a78uxot6.fsf@telefonica.net> <87a78uuvde.fsf@gnus.org> <8853390e-f4a5-c295-4f94-cf417ec8db5f@yandex.ru> <83wobv2684.fsf@gnu.org> <878soakddl.fsf@gnus.org> <83wobuzf8y.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="195303"; mail-complaints-to="usenet@blaine.gmane.org" Cc: =?UTF-8?Q?=C3=93scar_Fuentes?= , Lars Ingebrigtsen , Dmitry Gutov , Richard Stallman , emacs-devel To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 20 17:53:56 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iXTEp-000ogG-LK for ged-emacs-devel@m.gmane.org; Wed, 20 Nov 2019 17:53:55 +0100 Original-Received: from localhost ([::1]:60616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXTEo-0004Ht-Dr for ged-emacs-devel@m.gmane.org; Wed, 20 Nov 2019 11:53:54 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49295) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXTEM-0004Ha-05 for emacs-devel@gnu.org; Wed, 20 Nov 2019 11:53:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXTEK-0005Qg-Sc for emacs-devel@gnu.org; Wed, 20 Nov 2019 11:53:25 -0500 Original-Received: from mail-il1-x142.google.com ([2607:f8b0:4864:20::142]:42003) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXTEJ-0005QP-73; Wed, 20 Nov 2019 11:53:23 -0500 Original-Received: by mail-il1-x142.google.com with SMTP id n18so255476ilt.9; Wed, 20 Nov 2019 08:53:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=zvBdOqMdnmwnaM/QTGB0rJjPPqXYewI5xL6aeec//JI=; b=s71Iivt8WuIDjdx/U3nGaFtFKDN3Vhq7jvsUS+/NYmVb7/3GjwDW+kMoZZf77KKOeR 7hGSsSCJemMHkvO7SHL1iAQQOU2NbfnlllfX8IVCUwhj9Q+AhQV34DKuwwic+NbFvcoH kYMZ/dkGfxZ72mQva1t3QPgQRN/ouIAIrYQaD5Xxu1/BjFvJvk6vq9shEpDt6hIunl+2 WyvasjYNBfqc/Qf0K6xkON0cts3pS+6uyjQekyEXJxc8TP5GpXI8gEVYuGobFBZihQji h1+Tt4BJ7XiM/3IEUuYpyYW9Ee5m/TAQj9/bG3k6jq7ocwmpbzTNIC4nmA1XiL6GEsWv uL2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=zvBdOqMdnmwnaM/QTGB0rJjPPqXYewI5xL6aeec//JI=; b=De+lu06ScHPJ626JXnpphX1549b0yvU+4GJ6h5hL0KOwxdoi6hT/M5cNMND/cXfFy9 9DnembwEJ/psOhM7+ano3g8YZtdO70xLEfIlvglNeMVewDMdHUMdDn8TS4J0vodZcst7 5NCusHGBni+0rGmnPtKCTTfbttVHNdAgc0MWdHtkVsVYgq+F+RyrkjiDKtbrIejrmd+m RkMEQR87wEM0T9pj7lGD2/a5hYFlTKF/Q9Zh3cBsnfQ03zHJSMJvKCdjjv9jUh1ys2a7 91x9aw4Q1kS9Y8FobEdJhmk3uOQgxGSklRE/ZIa0J2oU6j18LoCIbkcJ0yXpS39KoF2h n3tg== X-Gm-Message-State: APjAAAXcooXM+N6OyRBNQrm7kS2DxSRELZLKP9VddWykVWoai+KhBpQn h1KevPQGXsfpxRsesdCTYJHMNYE9B5Fp44UwLc79uw== X-Google-Smtp-Source: APXvYqzHLqJWJmF+NvfFhYZY6KqC2lfB0b31B61BA2sF7S6jSR68++hK2VAjBNy2A95uR70QJllHgJaFKtbIzbvhwFQ= X-Received: by 2002:a92:9f1c:: with SMTP id u28mr4265876ili.97.1574268801981; Wed, 20 Nov 2019 08:53:21 -0800 (PST) In-Reply-To: <83wobuzf8y.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::142 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:242504 Archived-At: On Wed, Nov 20, 2019 at 4:27 PM Eli Zaretskii wrote: > > Of course, if somebody wants to hit the "merge pull request" button > > in Gitlab, they can do that, but for most smaller pull requests, > > Gitlab would just email the patch (presumably) and we can apply it > > locally on our machines before pushing to the repo, just like now. > > What you describe is not the PR workflow that people are used to. I don't think it's very far off, though. Here's my usual workflow with GitHub, in the hope that it helps the discussion: In GitHub (very similar to Gitlab), I will often cherry-pick the PR's commits, squash them, make minor adjustments to the commit message or even the contents and then push them myself, preserving the with the original authorship (and sometimes crediting myself as the co-author). To cherry-pick the PR"s commits, I just `git fetch` from a special Git URL that references the PR's number. In other words, there is no clicking in the web interface required at all. I can push my changes to master directly, but oftentimes I will push them to the submitter's PR branch directly (when the submitter gives me permission to do so). Again, no Web UI is required for this (though it helps to track where things stand at each moment, of course) When I'm happy with the changes, I push to master. There are some situations where GitHub detects that I merged the contribution. For the cases where it doesn't, I sometimes include a "Fix #PRNUMBER" line in the commit message. This ensures it is automatically closed. Up to this point, I have not used the Web UI at all. There is small wrinkle though, which may or may not be important: Github doesn't mark the PR's I merged with the "Fix #PRNUMBER" label purple, its oficial color for a "Merged" PR. Perhaps Gitlab could support "Merge #PRNUMBER" as a way to manually mark purple. >From the contributor's side, I've never had anyone object or find this confusing. I believe once the submitter sees his/her commits in the DAG with the little avatar they know what's happening. Also, the bug numbers in the commit message automatically create clickable cross-references in the PR's discussion page. (This is like if debbugs automatically sent emails to the bug number everytime anyone composes and pushes a commit that mentions the bug's number.) --=20 Jo=C3=A3o T=C3=A1vora