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: Fri, 11 Feb 2022 10:29:22 +0200 Message-ID: <83v8xlst5p.fsf@gnu.org> References: <834k5d3hbv.fsf@gnu.org> <83o83l1v51.fsf@gnu.org> <83k0e3vox9.fsf@gnu.org> <83fsoruv2u.fsf@gnu.org> <83o83eudgz.fsf@gnu.org> <83ee4atzh5.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34257"; 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 Fri Feb 11 09:33:36 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 1nIRN2-0008hF-Iq for ged-emacs-devel@m.gmane-mx.org; Fri, 11 Feb 2022 09:33:36 +0100 Original-Received: from localhost ([::1]:60742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIRN1-0007Rb-GL for ged-emacs-devel@m.gmane-mx.org; Fri, 11 Feb 2022 03:33:35 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIRJ3-00053Q-2F for emacs-devel@gnu.org; Fri, 11 Feb 2022 03:29:29 -0500 Original-Received: from [2001:470:142:3::e] (port=47130 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 1nIRJ1-00005f-If; Fri, 11 Feb 2022 03:29:27 -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=tBXFDUbF8NjGkcqym5KzERLsL1hNmi1tIVPih5WzDPc=; b=mrLbeW9pYrQc aPpz1sA/6OJ/OxFnkGrRs8SFSPaSu8NIS9M1t764fyPlmfP8j+vi/7TWNo6fbqDyDSbIraL6PYXxR m3uxt2AJSVZm0eH1cjNpWOqEOPvuNDtd1H8xNH2Q0Vfpexrx9ojuDnvOkn76LlfNAq9j22+k/dWun XIrZsAcFfc/MdQy8BQslqvpPyPTVF9xv0OCTH2oLxIObif35ZS7rE0mvrDV5u2n7sPie5kcKncTlc uA7K/MSx3MMIH465C/qHvptVtaU6m05TkrrDQkg43lOJclU1uJRIfQ4KMJE2uLumTL94VKPkMuIqP o1FXZddn3LLfTmlDzO5s/A==; Original-Received: from [87.69.77.57] (port=3777 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 1nIRJ0-0002fM-Rr; Fri, 11 Feb 2022 03:29:27 -0500 In-Reply-To: (message from Andrea Corallo on Thu, 10 Feb 2022 18:34:22 +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:286159 Archived-At: > From: Andrea Corallo > Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org > Date: Thu, 10 Feb 2022 18:34:22 +0000 > > Eli Zaretskii writes: > > >> 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"? > > I did what's described in git-workflow, so yes I had master checked out > and I pulled before trying. The only difference is that haven't started > a fresh emacs but loaded gitmerge.el in my current session. Next time > I'll try with a fresh session and maybe with -Q. What was the default-directory when you invoked "M-x gitmerge"? It should be the Emacs repository, and Emacs should know that the current branch in that directory is "master". Starting a new Emacs session is indeed better. (I also have separate directories for master and the release branch, so for me changing the default-directory ("M-x cd") also means I'm sure gitmerge will use the correct branch.) > Anyway I was thinking if it wouldn't be correct to emit also a warning > if libgccjit is not available. This condition could prevent some > package to work as expected (ex evil-mode IIRC) so might be worth to > inform the user that and emacs compiled with native-comp is being run > without libgccjit being available. I'm not sure I see the usefulness of such a warning. If Emacs works correctly regardless, the warning could annoy. So I tend to think we should introduce the warning only if enough users complain that Emacs silently does something they'd prefer to know about. Thanks.