From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs Date: Mon, 17 Aug 2020 20:43:02 +0200 Message-ID: <87364lp0zt.fsf@gnus.org> References: <20200816182558.16607.52991@vcs0.savannah.gnu.org> <20200816182601.16F2A209AC@vcs0.savannah.gnu.org> <87imdisam3.fsf@gnus.org> <83k0xxgt81.fsf@gnu.org> <0c69fb1c-330c-efcf-6005-95117bba9057@cs.ucla.edu> <87lfidp7bd.fsf@gnus.org> <837dtxgpyz.fsf@gnu.org> <877dtxp2sx.fsf@gnus.org> <83364lgmth.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="33580"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: rpluim@gmail.com, eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 17 20:44:45 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 1k7k7h-0008bu-HB for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 20:44:45 +0200 Original-Received: from localhost ([::1]:38664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7k7g-0003dZ-Ep for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Aug 2020 14:44:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7k6J-0001iR-K9 for emacs-devel@gnu.org; Mon, 17 Aug 2020 14:43:19 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:41492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7k6G-0005fM-WC; Mon, 17 Aug 2020 14:43:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eLiM6oth4t1qIBMYwgQhD6OfwqY1CAS2f174XlP4Mg4=; b=iQ3Sswh9nWdBpFw2wQBcof0zGR E6rd05rFUHMJKAVhwNJiMn5w6UJnXmzsuQhmJgmEZNOezLZTYHXNPXf7do8F8k8Utpf+5vVtEHOAQ iHQlf/0OYsOD317hgyTt16DSiVYgcEPq3hhKVP2UjGa/pZuKOoIdYjEzTOClEdYejFOU=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k7k64-0005bO-9u; Mon, 17 Aug 2020 20:43:12 +0200 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAADFBMVEX29fXDuLK8hF// //8ZpaA9AAAAAWJLR0QDEQxM8gAAAAd0SU1FB+QIERIlOTGAp/4AAAG2SURBVCjPXZLBbptAEIZn ELsKnJZqqRxOVuRWdp5ibdlIuRGLjVpOrmRXhKegh1x8gkqgOic7wqjsU3bWtVQ1c2E//n8GZmYB /gu2rWSyQoEdgV+lMmmcWlUEWFa5/AdHffPifLtCOpcKhVLwLtxpAIJbC0ks/6zEWYrO2rp8gjut 0LyQ2OWfDrtA8LeClCSfmUancSkra4NYh5oBUFIn4kw/a/dvbXwomlCrxFZjwFqDelHXCpBNMTN6 3HNfAS8nUWtM2CkPwDnC7JwNT9Ul/TeEJ/3WfEFLxhbom5/msQS8/zo7FOdsYRwCX4ZhYZ5KJKBw XlPzzK0ClRdnfTvw4QPB9pYVfUtD4wSjCkzbdBMeK/vjbrZ/POYRAf5QMtp33fSeE8QrEb1W3XRk J+T6y+/1+td1cLya92YPB0FfVKcSd4VWhw31o47gDNkWLkCNL9tBwspmwCZa0taEsOBtETBBI40F iFaOmg9gbA4yz8dKbmzfjlGei/XotLwAeDCmQ3Tdo32gtfl8Xi8876PH6NXkZn3nyCyQHkEyWt8t ZBqMJdk2pCzCNJC0LgjZPMBbhu67K/EH3I55YSxsg9sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjAt MDgtMTdUMTg6Mzc6NTcrMDA6MDBOFzfIAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTA4LTE3VDE4 OjM3OjU3KzAwOjAwP0qPdAAAAABJRU5ErkJggg== X-Now-Playing: Trash Kit's _Confidence_: "Medicine" In-Reply-To: <83364lgmth.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 17 Aug 2020 21:16:26 +0300") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham 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:253906 Archived-At: Eli Zaretskii writes: > I didn't say it was magical, I said it can cause subtle problems. I > forget the details, but rebasing after merging could bring the same > commit more than once. Or something like that. I don't see how. It's just three very simple operations in one: 1) Remove your own recent commits. (Can't fail.) 2) Pull from the remote. (Can't fail; there's no newer commits in the local tree.) 3) Apply the removed commits as patches, and re-commit. (Can fail if there's a conflict -- which has to be handled the normal way.) There's "philosophical" issues with rebasing (in that you're pretending that your own changes are newer than the remote ones), but that's not something we care about. > Why do you feel the need to rebase? The default merge that pull does > is as "non-magical" as rebase. Well, as we saw here, we got the extra, useless "merge" commit email (of interest to nobody), which started this whole thread. :-) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no