From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs Date: Wed, 09 Mar 2016 20:44:59 +0200 Message-ID: <83mvq7o5hw.fsf@gnu.org> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> <87y49vz4cg.fsf@acer.localhost.com> <87vb4zb0i4.fsf@gnu.org> <837fheuu6a.fsf@gnu.org> <83twkiteb3.fsf@gnu.org> <83lh5utbxb.fsf@gnu.org> <56DDD02A.20809@cs.ucla.edu> <83fuw2t2ue.fsf@gnu.org> <56DE0F6A.6010207@cs.ucla.edu> <83pov5rmt6.fsf@gnu.org> <56DFD78F.40205@cs.ucla.edu> <83fuvzprh5.fsf@gnu.org> <56E0687D.1000904@cs.ucla.edu> <83r3fjo6a9.fsf@gnu.org> <56E06CC6.5000604@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457549114 32490 80.91.229.3 (9 Mar 2016 18:45:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Mar 2016 18:45:14 +0000 (UTC) Cc: mthl@gnu.org, johnw@gnu.org, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 09 19:45:09 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1adj6Z-0005CB-0x for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 19:45:07 +0100 Original-Received: from localhost ([::1]:43470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj6Y-0001QH-8F for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 13:45:06 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj6M-0001Q5-AW for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:44:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adj6L-0003kM-8k for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:44:54 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj6H-0003jD-GA; Wed, 09 Mar 2016 13:44:49 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4121 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1adj6G-0000v8-9Q; Wed, 09 Mar 2016 13:44:48 -0500 In-reply-to: <56E06CC6.5000604@cs.ucla.edu> (message from Paul Eggert on Wed, 9 Mar 2016 10:34:46 -0800) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201280 Archived-At: > Cc: johnw@gnu.org, mthl@gnu.org, emacs-devel@gnu.org > From: Paul Eggert > Date: Wed, 9 Mar 2016 10:34:46 -0800 > > On 03/09/2016 10:27 AM, Eli Zaretskii wrote: > > If you don't do merges, you won't ever see merge conflicts. > > I saw conflicts all the time when rebasing or applying patches. Perhaps > these weren't "merge conflicts" in some technical sense, but they were > just as much a hassle. git-merge-changelog supports rebase and cherry-picks as well. So your assumption that it won't help you is based on a mistake. As for applying patches, just don't apply the ChangeLog hunks.