From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: Merging the pgtk branch Date: Sat, 18 Dec 2021 21:01:29 +0800 Message-ID: <871r2adq3a.fsf@yahoo.com> References: <20211207.010121.923567574254848362.masm@luna.pink.masm11.me> <87pmq6bccw.fsf@yahoo.com> <87ilvmfip1.fsf@yahoo.com> <20211218.215200.320390654799243849.masm@luna.pink.masm11.me> <87a6gydqe9.fsf@yahoo.com> <83bl1eax3i.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6047"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: masm+emacs@masm11.me, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Dec 18 14:06:01 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 1myZPU-0001FS-2q for ged-emacs-devel@m.gmane-mx.org; Sat, 18 Dec 2021 14:06:00 +0100 Original-Received: from localhost ([::1]:59558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myZPS-0005kr-Lk for ged-emacs-devel@m.gmane-mx.org; Sat, 18 Dec 2021 08:05:58 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myZLP-0003Wh-5Y for emacs-devel@gnu.org; Sat, 18 Dec 2021 08:01:50 -0500 Original-Received: from sonic312-23.consmr.mail.ne1.yahoo.com ([66.163.191.204]:44006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myZLK-0002ha-Jt for emacs-devel@gnu.org; Sat, 18 Dec 2021 08:01:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1639832500; bh=L2Ggi3H08UHwxnyOnVWLCBL0jfv9HMUlctOvX0RN06A=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=GZVvZ0/0vmyDunP/MgDqhGVgjluux4LZNk8hUzQiwjWDMAkxycCUF8TbbNFtBa1DOwNw6DkH5zzJ4gVKATYDF6wqf+y3XxigDyNCVPYB5/6mJv5/xilbHC4IQSU2lCA8eTJSHxDxYFLgtqA0zaqXYi85CmMFcvIoZ+Bb5M5zbDXNjh7Bk6J3QyCJqaSjuuePIAgkw9NOQt3fT00Ho12Fe1JWVs1kS5gy3f7Fa/kCvs6+ePH2fk4PE63QcDTOVgs0RaZijMeo/OuyIS+Yq7YdU8ZSKo8qjeYwHZ9K/L9mIsNGLSNLSt8KJCEjaBlutw8df/5Gs5zRwW9pbEAz7ln9Bw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1639832500; bh=9zoj7aZYvHvfD51CWAyiOYWkdGv+TcfxqvhH35ObzeD=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=rmPpITpoIVaT7HT5smnmE2ALF4xJvSqnbo4niwZQg3N5LTq28ZhvA4o4YBpewN7HdXREtoySE2VNfMz/jfIJWLY1FlAgtaOBntjVr2sA2AOCDZdIYvHyeDO45JpKcOc6OGhlAT3KjKW0ySd9aptoYhhlpq5wYXfTNOveVxTRDjUVE0BdCYuehiFNULQt7GAoh+M16kX8bi3hyaPfnoZ9DP+Gqh8c78/pRKyDKU1omm6GPNM1PpY8Dy2yXYS/+bmTDG79+Ez+P2sGla3RGxSp3OGifbsElb+VJ4zjL8uZm7Z7LuD5Fieqa2JdyVBD+UyV+hjYMNQxvPI8LGb5VCbe2Q== X-YMail-OSG: VaA2lroVM1lT7t.VG0aB7j6d3RIlEDYCyUabuOLDaBDfXYhGEFB8qe9ED87hoSb szUEO9qqBwgALXGqEZJmnNg2oYA2DQMs7TiBdfpfgNNjtUg_kxRIh_Yldbl_Y3Ortbj4j2muMkAs akEYGynoZQ396FlMEGKgFK5sLT5L9LEqaM6IqLlkuBmo5zAkSIUFpbmzLoH0.tfmIXGaHP.WOOsf OB0SeF8U9UUktocBydARRP_ApQcKacqq5YGEvLOG5iGiExfUkf.JduFyyFyb6uNcMkVf294FD.2w jo.Vk1CY2AlKYYByyrrr3i785szetK0jTD.WqrfnR_ZuIYzpPNUXjyTxNSdG1b9hhKWXOHMNsP3l UQt0chB1ZOik5GP1QrRwCrJD7UoriJWH6cOEF7rT6WmyPepxzNQoglaXhlqqBQmeKLNIMQPIr302 zCTXW.ng3pTZ11C0MMX9TRbMTR4q4IdhzlDES_UEq5bimFD9XR3e6LYvkUjKi9UQMOnPUmtosGTo XRbdE.c12ip1wCkMCO_qG.CZ9Jw_deenLmgYs3uVilEei1JoFLO9U7ZdrSHTbwZjo_mNL.qPAQf1 IZdTrjHZSQ1IB9JGtOfuwcYXoRrNUhzOpP3ODzGTuFvb7xDuqYrI.qk4cN6XVALwbdZ6.TmHS2F4 I7gyoYlTOvdpL1N6ejsYi6.cBsox_laySFb8TvjXM3DBLn5IIaKlsQm12jQwbNo.SqaFs7Y27tdm sM_osjFRw7xaEsJynlCM35eNeyucTqsuNNDxNYlzUSGKkIek22.mfACzqC9gU.vjPvlZvmXu6SY. _gqY_Cd0OsjxE.gzsFm3GaJ79V5zWCmBatH.l1E6B1 X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.ne1.yahoo.com with HTTP; Sat, 18 Dec 2021 13:01:40 +0000 Original-Received: by kubenode511.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 38f295d8cd76a8e930154d6d105df41a; Sat, 18 Dec 2021 13:01:34 +0000 (UTC) In-Reply-To: <83bl1eax3i.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 18 Dec 2021 14:58:25 +0200") X-Mailer: WebService/1.1.19498 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.191.204; envelope-from=luangruo@yahoo.com; helo=sonic312-23.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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:282296 Archived-At: Eli Zaretskii writes: > Just "git merge", and pay attention to the log entry. So I should write a detailed ChangeLog for the merge commit? I'll get right on that, thanks. > After some time, remember to delete the feature branch. BTW, shouldn't we put an error message somewhere in configure.ac telling people that the branch is now on master and that the feature branch is obsolete? Lots of people are tracking `feature/pgtk' right now, and I don't want a repeat of the "people are using feature/native-comp after it was merged to master" situation we had earlier. Thanks.