From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: soyeomul@doraji.xyz (=?utf-8?B?7Zmp67OR7Z2s?=) Newsgroups: gmane.emacs.devel Subject: Re: I just pushed master into emacs-27 Date: Thu, 30 Jul 2020 10:13:22 +0900 Organization: =?utf-8?B?6YeR6Zm1ICjsl7Dsm5DsnZgg66eI7J2MKQ==?= Message-ID: References: <87wo2m80nh.fsf@petton.fr> <877dul26ek.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="10580"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) To: Emacs Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 30 03:14:09 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 1k0x97-0002fW-EO for ged-emacs-devel@m.gmane-mx.org; Thu, 30 Jul 2020 03:14:09 +0200 Original-Received: from localhost ([::1]:43138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0x96-0006Bf-DI for ged-emacs-devel@m.gmane-mx.org; Wed, 29 Jul 2020 21:14:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0x8W-0005kh-4L for emacs-devel@gnu.org; Wed, 29 Jul 2020 21:13:32 -0400 Original-Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:37324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0x8U-00081u-L1 for emacs-devel@gnu.org; Wed, 29 Jul 2020 21:13:31 -0400 Original-Received: by mail-pf1-x42b.google.com with SMTP id s26so14076176pfm.4 for ; Wed, 29 Jul 2020 18:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=doraji.xyz; s=yw; h=from:to:subject:organization:references:face:message-id:date :in-reply-to:user-agent:mime-version:content-transfer-encoding; bh=CBCwUj3sk4cQSpLUzC8EgVmiVoxQjvN3wVYJtRFh32c=; b=aJSf1/jmRp9fjq54K0ehrzbQbnDMmpWs8Z6/wc3Nd5bJj4zqfDpMtGkqPG5Tp5Z9yQ vM6rzBcunsSUObn0V+NKjpT5msTaajldYImdon8T45zqpl9PTDhZajy8J429Ac2w0ZZM hh+KYvR3t3eZ6xYch1M7+aK8rAj5G4jlbM+RDtVoPwoSOtNupwGGgUVSswEDCV/ayaVJ a5ZjXqQkfe4N6Muubjup9x/uDxrApZ/sx/zWg4uOuz4qqBDVNRPPCPNBVlgKf8IEvRbp eWztBaswhGzMTipctm3wV9dU2k4DDF07CagRhhpoTSdMN+Hsq0/8r0GVRAtHgHhRxGG4 pbbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:references:face :message-id:date:in-reply-to:user-agent:mime-version :content-transfer-encoding; bh=CBCwUj3sk4cQSpLUzC8EgVmiVoxQjvN3wVYJtRFh32c=; b=g7ddCHaLrtiLSJXTKfWsvvW0keRGQmxbPat4DT9TLtTv8ugcMq+KNv2Io9xGMG0afl 7DjK5x8PLD0NfSj6KZ/m3CFM42LZIGjUkuuc40ZC3kN9oDaC69nfkgVB57eGyz4j2s+g wxfsdR/joQ7GwnX37mDYUbQJA9UYOggqSqvKc8XflmkQLW9o1mQgwvIrCP2/wPZFidoN K9rglnFFDeRXdhV+Oqc483XFJLjhRN5wK5UZNfyY9rkn6tEJbBDwZfbTPeCtJMoOd5R2 SCEto6cBEN4pWKr3ixyLsHKoGoA/bwNdYefaBi45yMAngtqu7zaKDOPlKLsGiuAabQDr QzWw== X-Gm-Message-State: AOAM533OCaTvKdDRQ2JuiUM7f1NQwCQose/7JRYUV3HpAC7m38HFfRYO CYb8yanq3+lKMjjJMyQ0t29wM9t5SWZxpg== X-Google-Smtp-Source: ABdhPJwvbQSajPSzPf8+rZDgXc+8gqmpLad4LKOxIORFLq+GkGkaagWRgtPGRaq0UZExRaGVTiXxrQ== X-Received: by 2002:a63:e907:: with SMTP id i7mr1195219pgh.210.1596071608811; Wed, 29 Jul 2020 18:13:28 -0700 (PDT) Original-Received: from delta.birch.chromebook ([211.228.200.237]) by smtp.gmail.com with ESMTPSA id b185sm3680316pfa.148.2020.07.29.18.13.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Jul 2020 18:13:28 -0700 (PDT) Original-Received: (nullmailer pid 7371 invoked by uid 1000); Thu, 30 Jul 2020 01:13:22 -0000 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEVMM2UIAhGJrpkJDwsDAwgJAggKPnwFBAIEBAQJAjTkRM0eAAACN0lEQVQ4jW3Tv2sbMRQHcPnSDt78bMWctkOBgDc710I8Cl6DOpZm6RgPBx4LgbrjUbVVNiuXHNF/2yfJzqnEwmDfffyV9PSD2UNTfuu9A/65cT39AnZ4j8pTcxzM/HlO4F8BnAcHCK14CuBeQXAFAJwbg/MmS2igEDWtrfZ9PyQiiJCxei1o+CNYbUJX4J1Cr8TQlbWmFZ3vijFwT58c7kW3Z3K84oJrFAPYds8Yk6zmwnGLGai9rApZnaGgBbAZwF6GdoY3DiADA74IMMa5KzFPGEWDSLmAiSttDkhTqUVxAX+c/g9ER7BeVnzyZAdA5Go9Y+OCydXNXZlDCetJtfpWyXp6xzNQmkA+i0J+nI7jGJjKVjPfXYUKpXtc3AbQR2CraazQP17StKgr/QpXEZrNAdIY7Wx/HmHR91U2K8XP10BLSEvS94scoPUJvN/mCVSqxiVBBdCzAbDkeG2/XlVyBCA8ZoD4AZdUxYsiABPABNCIhsagnng4LDvL0LYYijdWCZrsRTx3YUnQGh46+0sZ2tv3MZ1AxdKNxnuYFO9onTEClYZpHX//LNjyOiRs2ihzhO9MVnYACqo051YUZwMYhXEW1L7s2XU6LxZvI6g4L1NTeSm7+wUBlCpD3Cyl3KXEqq5ZG+8RhEfBqsN2jrqaQYQ2PH/qRqmnh4auGgjnXPrjj1 udunqg887i/daHXTlA+Gbgm8aX9k1jvifQp2Ajm+2pRL+hk3QKGikv3dv3IdE4cwL+ATzHtMu8OktOAAAAAElFTkSuQmCC X-Thanks-Workers: =?utf-8?B?7J2066eI65GQLCDsnbTsiJzsi6AsIOyghOuqheyImSwg?= =?utf-8?B?7KeE7ZGc7Jyo7IKsLCDqtIDsmrTsnqUsIOqwle2DnOqztQ==?= X-Thanks-Today: =?utf-8?B?J+uvv+q4sOulvCDtmZzsnYQg64uk66Oo65Ov7J20IO2VmA==?= =?utf-8?B?6528LiDtmZzsnYQg64SI66y0IOyEseq4ie2eiCDri7nquLDrqbQg7Zmc7J20?= =?utf-8?B?IOq6veyWtOyngOuCmOuLiCDsp4Trk6/snbQg64u56rKo7JW8IO2VmOuKkA==?= =?utf-8?B?64uI6528Lic=?= X-Thanks-Thanks-Thanks: =?utf-8?B?7LKc7ZWY7LC97IOd7J2EIOuLpCDsgrTrpqzsi5w=?= =?utf-8?B?66Ck64qUIOuniOydjC4uLl5eXg==?= X-Thanks-Absolete-Coding-System: UTF-8 X-Operating-System: =?utf-8?B?4omqZGluZ+KJqw==?= -- The Gnus X-Gnus-Motto: In a cloud bones of steel. X-Gnus-Desktop: GNOME ('Ubuntu', '18.04', 'bionic') In-Reply-To: <877dul26ek.fsf@gnus.org> (Lars Ingebrigtsen's message of "Thu, 30 Jul 2020 02:28:03 +0200") Received-SPF: none client-ip=2607:f8b0:4864:20::42b; envelope-from=soyeomul@doraji.xyz; helo=mail-pf1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, FROM_SUSPICIOUS_NTLD=1, PDS_OTHER_BAD_TLD=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_BLOCKED=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:253338 Archived-At: Lars Ingebrigtsen writes: > Nicolas Petton writes: > >> I just realized that I pushed master into the emacs-27 branch... I must >> have rebased against master out of habit, like I always do on some other >> git repositories. >> >> I'm really sorry about this, it has made a big mess in the emacs-27 >> branch. > > Oops. My sympathies. > > But perhaps this isn't really that serious... I mean, if it had been > master, then that would have been a different story, but this is just on > a branch, so the history there isn't really that big a deal, so you can > just revert the whole thing? > > If the history is important, would it make sense, for instance, just to > make a emacs-27-2 branch starting from just before the merge and then > continue off of that? Indeed, i also did think same with Lars, for a while. Sincerely, Gnus fan Byung-Hee --=20 ^=EA=B3=A0=EB=A7=99=EC=8A=B5=EB=8B=88=EB=8B=A4 _=E6=95=91=E6=BF=9F=E8=92=BC= =E7=94=9F_ =EA=B0=90=EC=82=AC=ED=95=A9=EB=8B=88=EB=8B=A4_^))//