From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [External] : emacs-28 windows binaries available from alpha Date: Thu, 10 Feb 2022 19:15:18 +0200 Message-ID: <83ee4atzh5.fsf@gnu.org> References: <834k5d3hbv.fsf@gnu.org> <83o83l1v51.fsf@gnu.org> <83k0e3vox9.fsf@gnu.org> <83fsoruv2u.fsf@gnu.org> <83o83eudgz.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19311"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org To: Andrea Corallo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Feb 10 19:36:08 2022 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 1nIEIZ-0004ra-OX for ged-emacs-devel@m.gmane-mx.org; Thu, 10 Feb 2022 19:36:07 +0100 Original-Received: from localhost ([::1]:56636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIEIY-0005WI-PZ for ged-emacs-devel@m.gmane-mx.org; Thu, 10 Feb 2022 13:36:06 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:52640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nID3G-00061Z-4r for emacs-devel@gnu.org; Thu, 10 Feb 2022 12:16:14 -0500 Original-Received: from [2001:470:142:3::e] (port=60948 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nID3E-0002Ko-CL; Thu, 10 Feb 2022 12:16:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=o/oxyPDOPn8VWnZuQlFRWk6ah+LiALsc33VFQ2Zppyo=; b=hFrCHzxsJAw/ FSu2LiPAbk4p5AtcePxmps9e4YD51+W6GkYLYTMnK/ibZK3foG/Woc1jzdgachI+B3Zd15+3/Al1f whnSx9vuczWqgK4212CmsRu26HVpkrthQ6bxx5uAYqZFJDaw5u8hNkvPW/ojdqtJHjpzCChvpMAl1 voN7N5cZUaSUl3zxCWGw65j4jCcpxGzY/DUhiEu/zurDLOcI9DbUFY76j43dGPP0vpYHyDpJ63T9i tuhW8LIm7YpPXkExQrY0GOM3dZAbB8VDF02lVYi72PQMSgOmmRC2w0ejHxOtEgGX4FOWrkZzFwZK6 dXS5RRTo+AU0ZgaSyVn47w==; Original-Received: from [87.69.77.57] (port=3399 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nID2Y-0007Rm-Ci; Thu, 10 Feb 2022 12:16:05 -0500 In-Reply-To: (message from Andrea Corallo on Thu, 10 Feb 2022 13:36:10 +0000) 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:286145 Archived-At: > From: Andrea Corallo > Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org > Date: Thu, 10 Feb 2022 13:36:10 +0000 > > Eli Zaretskii writes: > > > Fine with me, please install on the release branch. But please add > > there a comment explaining why we do this, and mention that it's for > > MS-Windows (you can take the text from the comment I wrote for my > > comp.c patch, which will now not be needed). > > Done with 202d3be873. Thanks. > PS I tried to merge emacs-28 into master using gitmerge.el as suggested > in git-workflow as I suspected a conflict there that I wanted to solve > myself, but it says "nothing to merge". Not sure if I'm doing something > wrong. I merged that change, but for the future: what exactly did you do, and in particular did you remember to switch to the master branch and do a "git pull" in master, before invoking "gitmerge"?