From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Should we restore manually maintained ChangeLogs Date: Wed, 9 Mar 2016 20:39:17 +0200 Message-ID: <684bf3cb-9157-090c-9a0c-a163c1257eeb@yandex.ru> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1457548789 26939 80.91.229.3 (9 Mar 2016 18:39:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Mar 2016 18:39:49 +0000 (UTC) Cc: mthl@gnu.org, johnw@gnu.org, emacs-devel@gnu.org To: Paul Eggert , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 09 19:39:44 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 1adj19-0000vy-45 for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 19:39:31 +0100 Original-Received: from localhost ([::1]:43455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj18-0007AT-HR for ged-emacs-devel@m.gmane.org; Wed, 09 Mar 2016 13:39:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj13-00077j-2w for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:39:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adj0y-00023T-Vv for emacs-devel@gnu.org; Wed, 09 Mar 2016 13:39:25 -0500 Original-Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:35482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adj0y-00022x-Or; Wed, 09 Mar 2016 13:39:20 -0500 Original-Received: by mail-wm0-x233.google.com with SMTP id l68so191982523wml.0; Wed, 09 Mar 2016 10:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=uGwKEbhK3YortQvfNGhKNlqUel8MRf4WX4DN7H1Ipnc=; b=druWRDJeOjvT+4qJ4wkHnPipRvU+6RsNR6aPxVdJhtxVIwBdk7gSXk1J3U1DfbbE4p nZ0R5vZ264mB7j79ViyFLQLkSFlBj4B4r4Ne4ktovQFxeMEhMjEyRe17jfCH882LOtiQ 5N/OKm0XQY06l/MY3/hhnK+ptRbt4OXaxbunN4cSk69QmweEJpdw5MNb0qbM0bS91+rU boexpRRzeHfbwsu/ofl8CCxAeeHv6msf7K8Ad7q6xXss71bx7vTdBUWxYv+5zA4eBhnD /JE1/6d6PwXj0vjpDrAQCgWD+ydinszuuLYP8qdCL6p+mf9A3PbQViNiXPknbUAYOLxi 4K9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=uGwKEbhK3YortQvfNGhKNlqUel8MRf4WX4DN7H1Ipnc=; b=l/pUt6OsC2TixSRy7xGvLdGhDE605+Q3VRVQFqQdQjdo1/ATfaf4wJzqZR7neBF9Hz tX8JKvsLVixYEQb3S0mTybMAN5sBWCoUTUd0z5tLoiwS/L8stySKgmNiO1U0n9uwwKgU PK/U3HaY6knyOO/VaMry1NwmZsVsUQmy0RATeqMcBquVbakx4tVMDDqmibyr+ObIl6XI 3ot9XX/phqOvF2Z/sune+cx9TUw3RpkMjaY+6ufgyieYqkP+v4POf4STcSoiX9Qwms6h kvpPerdRupsIEIDqFmbqfjDWVF2ti5w8hHVi2iBhIGVxzcEiCMcekSONONFIEdrKw93J GD3A== X-Gm-Message-State: AD7BkJI8CniAO76WAK+t4128QtPYbDl2edskaWW28rP1L5cDwyr0wMFOg+4onmeqWIPjaA== X-Received: by 10.194.236.3 with SMTP id uq3mr36337979wjc.119.1457548759979; Wed, 09 Mar 2016 10:39:19 -0800 (PST) Original-Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by smtp.googlemail.com with ESMTPSA id v5sm3491808wmg.16.2016.03.09.10.39.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 Mar 2016 10:39:19 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: <56E06CC6.5000604@cs.ucla.edu> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::233 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:201277 Archived-At: On 03/09/2016 08:34 PM, Paul Eggert wrote: > 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. IIRC, git-merge-changelog is supposed to handle those cases, too.