From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: I just pushed master into emacs-27 Date: Thu, 30 Jul 2020 13:30:57 +0200 Message-ID: References: <87wo2m80nh.fsf@petton.fr> <877dul26ek.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30355"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , Emacs Devel , Nicolas Petton To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 30 13:32:40 2020 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 1k16ng-0007mu-Ip for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 13:32:40 +0200 Original-Received: from localhost ([::1]:33788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k16nf-0003mb-JY for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 07:32:39 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k16mG-0002D7-Hb for emacs-devel@gnu.org; Thu, 30 Jul 2020 07:31:12 -0400 Original-Received: from mail-yb1-f171.google.com ([209.85.219.171]:37709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k16mE-0005rm-Hs; Thu, 30 Jul 2020 07:31:12 -0400 Original-Received: by mail-yb1-f171.google.com with SMTP id e14so393586ybf.4; Thu, 30 Jul 2020 04:31:09 -0700 (PDT) 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; bh=W9LqZgjvpl8ZO6Kadio+5+PX2bFJ7GCaSQeow7MdK2w=; b=Jhy/kKsRNX2OIGg8J+0IqLTps8JbzXnvYnFs9w36iKO8PEVzGzVtv+CvZofYEOBRy6 Z1WEsf6egh3nErZTu9R7vcrqK7UkwScKkBDGmRUo0TbPUt/akzxgWjvA5ZXbKdpjyFL1 XPEEK8KtmeZBHEzGGJ1kR2LyTXzOi+5E2GnBfnqUEr8//f5lvZKaTHyoNoED2IrRLba1 iGW9RpmgwIvUoGXFjdFlZeMO0/yxPQkhDx3YezsLxQBjPSDf5qPcbbvOZxhPFFKWvOEk kIBiB1sUTRWXuDCHvpura6oEejarciDgX79CrDa/b+Z1/LJ9WF2vxkqY52iM/ret5kHA IpuA== X-Gm-Message-State: AOAM531jb4PfuBRdBcFJNVZ73elU121edMos0unvRh4yMzmozbm073Jq Mgv7pgYNEBbLYSVzEHvN4qnMq3G8XT6dcLvZDeBy12V4Qhw= X-Google-Smtp-Source: ABdhPJxbDNtXMTmm7ajOrYZugq9PKRkm7YabBdg27xVeK+77KHuPFzJ8x9wn92a+YDA3okHtXjpDtTZ3At1uwIKqm/U= X-Received: by 2002:a25:3b4c:: with SMTP id i73mr4004308yba.129.1596108667951; Thu, 30 Jul 2020 04:31:07 -0700 (PDT) In-Reply-To: <877dul26ek.fsf@gnus.org> Received-SPF: pass client-ip=209.85.219.171; envelope-from=stefankangas@gmail.com; helo=mail-yb1-f171.google.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 07:31:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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:253350 Archived-At: Lars Ingebrigtsen writes: > But perhaps this isn't really that serious... Indeed, git is as good at allowing you to shoot yourself in the foot as it is at gracefully recovering from this type of situation. Stefan M did exactly the right thing here, IMO. There should be no need for concern if you haven't already rebased your work on top of the incorrect emacs-27 branch. (Also on master it would have made the most sense to do what Stefan M did, I think.) Best regards, Stefan Kangas