From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Daniel Brooks Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Thu, 02 Sep 2021 08:25:36 -0700 Message-ID: <87wnnzj8y7.fsf@db48x.net> References: <87h7fcnmq0.fsf@posteo.net> <28953ac9-60e5-7583-6297-750c04ca3748@gmail.com> <83fsuwrps6.fsf@gnu.org> <8735qwuhwf.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26484"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) Cc: Lars Ingebrigtsen , =?utf-8?Q?Cl=C3=A9ment?= Pit-Claudel , Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Sep 02 17:51:29 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mLozw-0006eb-Q2 for ged-emacs-devel@m.gmane-mx.org; Thu, 02 Sep 2021 17:51:29 +0200 Original-Received: from localhost ([::1]:55258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLozv-0003aH-22 for ged-emacs-devel@m.gmane-mx.org; Thu, 02 Sep 2021 11:51:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLob5-0000u1-Ku for emacs-devel@gnu.org; Thu, 02 Sep 2021 11:25:48 -0400 Original-Received: from smtp-out-4.mxes.net ([198.205.123.69]:51018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLob3-0000G4-Qr for emacs-devel@gnu.org; Thu, 02 Sep 2021 11:25:47 -0400 Original-Received: from Customer-MUA (mua.mxes.net [10.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.mxes.net (Postfix) with ESMTPSA id 4H0l9s5Xmsz3cH1; Thu, 2 Sep 2021 11:25:37 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mxes.net; s=mta; t=1630596338; bh=hJIfjFDP4TBh3+hQCIx/jV9nhyIjcjKHnDrLD/e7D74=; h=From:To:Subject:References:Date:In-Reply-To:Message-ID: MIME-Version:Content-Type; b=Zt835LWRMDDcr4eTEztDDC2zgohK0/NYAuAOaCwX5RqlPXmc01PIU540UVbEe1ETm vj0AhcZUBkgy5s/CVvqevxelvE233sDJBExjIa8o8Pl9/43QJmNrGMbfLKphZ4C2Wb HHooNrSYbt9R4p6ycW5omG9+1z7GDSsgl9/WBmLA= Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGOfPtRkwAAABJQ TFRFpKfbdou67PD6JjJgAwUWXGSeIcyLHgAAAkZJREFUOI1VU8Fy6yAMxLi+Q13fCZ3cnQL3dqTc 7RD+/1feStDXVnXHDuvVSivZTMba2GPdw3gyCGcMAFxTyrTd9dwGoxHiZX9PmRFUHYAQlGGtXY+F Uk0SJOxgJiUEnH1qkitT9D+pQub7qGAmUbR6bu3CvI96Yv6QqkBBMrsyfZccr1/RDXGDTLf4P7ZY glVxe2V+/ACXWO1gvDO9/gDRpFFVmPluvLcmBjd5H6d8DEte+Pbk4rcY/Fa5tLKLOtCZsuQKYhpa LOkYDT7hESya7/WIET3lfQBqX0pwFtbI832Is0ayMUR9B+12xjgPCQ089cfwkCkX6L5TPmRelJTh zMS0Sz1PyjLAMCUWjcmgQLWQMds+e3aaauZDf9dU9A2/8kPVF2odCUoMKHkfjJR+mbgC+DRiycw5 3XSqGe6HmhN/AWjHypkAXOAFW5EiuA1ge2GiZuMb0s1fSEXcATeLUfbyEY2L8yPOmdSsdghQXx3K pz2eoeXuYvMCINVFDrCdNfVUp4eJ6cSEbjbgFjBEvonGGTrgv9cHjAc8aVgSAPoxaONbzfwhDIhR at7IIS7fAGiDSwIA9alhhTBzfA7YM2FY6eMwayrIGK8FDFmshmUA43WqhFtpvoqG9HHaJ7fqtgTz 8EWVkgZgtsylFliHDgk0MB7KAEC45C/rgnGvanNLXyzOeTzcT2nw/N44gfrtYXRQLoz9Q3TgmJRx 2Mx/Q51qzpm+l3m8z2SWBqC5+PZXAtNYlGFf/gKfHfjFkDT4x7od7R+w3Ls+ZdQBuQAAAABJRU5E rkJggg== In-Reply-To: (Stefan Monnier's message of "Thu, 26 Aug 2021 17:52:30 -0400") X-Sent-To: Received-SPF: none client-ip=198.205.123.69; envelope-from=db48x@db48x.net; helo=smtp-out-4.mxes.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273707 Archived-At: Stefan Monnier writes: >> Indeed. But I expect that whatever we end up with, we (that is, the >> Emacs maintainers) won't have to click around, and won't have to >> actually merge anything directly. That is, I expect to have a command >> in Emacs that says "get that pull request as a patch, apply it, and >> don't commit it". So that we can fix stuff up before committing -- as >> before. > > Personally I tend to just use `git am` which *does* commit, and then > I use `--amend` or `rebase` to perform adjustments. Git supports that > particularly well. Yes, we can already do all of this without =E2=80=9Cclick[ing] around=E2=80= =9D on a web page. It=E2=80=99s quite easy to fetch the commits that the merge request is referring to and then use Git locally to add more commits, amend the existing commits, etc. I recommend using Magit to do this without even leaving Emacs. Incidentally, GitHub makes it even easier to do this because they add a ref for every merge request. db48x