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: master abf0823 2/2: New test tramp-test30-make-auto-save-file-name Date: Wed, 27 May 2015 21:10:19 +0300 Message-ID: <83oal5yjqs.fsf@gnu.org> References: <20150527134830.719.88862@vcs.savannah.gnu.org> <87wpzu3qi8.fsf@gmx.de> <83pp5mx81r.fsf@gnu.org> <87r3q1538b.fsf@gmx.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432750254 4398 80.91.229.3 (27 May 2015 18:10:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 18:10:54 +0000 (UTC) Cc: rgm@gnu.org, michael.albinus@gmx.de, emacs-devel@gnu.org To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 20:10:42 2015 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 1Yxfmr-0002TE-0O for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 20:10:41 +0200 Original-Received: from localhost ([::1]:55028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfmq-0001Xi-2Y for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 14:10:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfmi-0001XB-BD for emacs-devel@gnu.org; Wed, 27 May 2015 14:10:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxfme-0007XQ-Be for emacs-devel@gnu.org; Wed, 27 May 2015 14:10:32 -0400 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:34715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxfme-0007X4-31; Wed, 27 May 2015 14:10:28 -0400 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NP000J00T1UW700@mtaout28.012.net.il>; Wed, 27 May 2015 21:09:40 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NP000G4ZT444540@mtaout28.012.net.il>; Wed, 27 May 2015 21:09:40 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.184 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:186882 Archived-At: > From: Yuri Khan > Date: Thu, 28 May 2015 00:04:20 +0600 > Cc: Eli Zaretskii , Glenn Morris , Emacs developers > > On Wed, May 27, 2015 at 11:39 PM, Michael Albinus > wrote: > > > But isn't it stupid, that we get rid of ChangeLogs, and afterwards > > people start to mimic them for convenience? > > The point of getting rid of changelogs is so that you no longer have > to merge them. And changelogs are a kind of files which are very > conflict-prone. Only if you don't have git-merge-changelog installed and configured in Git.