From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Is it time to drop ChangeLogs? Date: Sat, 12 Mar 2016 17:33:16 -0500 Message-ID: References: <64a52598-ad53-498c-993c-67d7827dbdfc@default> <838u1uuuau.fsf@gnu.org> <878u1um2xl.fsf@thinkpad.rath.org> <87fuw090k7.fsf@wanadoo.es> <83y49spuxt.fsf@gnu.org> <87pov4achc.fsf@acer.localhost.com> <83r3fkpb3u.fsf@gnu.org> <83lh5rps0t.fsf@gnu.org> <56E066BD.5050403@cs.ucla.edu> <83wpp9jt82.fsf@gnu.org> <87pov1dje9.fsf@thinkpad.rath.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1457822026 25333 80.91.229.3 (12 Mar 2016 22:33:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Mar 2016 22:33:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 12 23:33:37 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 1aes6K-0001Wb-Qa for ged-emacs-devel@m.gmane.org; Sat, 12 Mar 2016 23:33:36 +0100 Original-Received: from localhost ([::1]:33794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aes6K-0007iW-2v for ged-emacs-devel@m.gmane.org; Sat, 12 Mar 2016 17:33:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aes67-0007iC-IE for emacs-devel@gnu.org; Sat, 12 Mar 2016 17:33:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aes66-0008IF-Nq for emacs-devel@gnu.org; Sat, 12 Mar 2016 17:33:23 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:53700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aes62-0008Hx-OB; Sat, 12 Mar 2016 17:33:18 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id u2CMXGfW026286; Sat, 12 Mar 2016 17:33:16 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 4C19AAE33B; Sat, 12 Mar 2016 17:33:16 -0500 (EST) In-Reply-To: (John Wiegley's message of "Sat, 12 Mar 2016 14:10:16 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5608=0 X-NAI-Spam-Version: 2.3.0.9418 : core <5608> : inlines <4489> : streams <1601935> : uri <2164480> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:201568 Archived-At: > 3. That the mechanism in #2 work with merges, cherry-picking, rebasing, etc. AFAIK if the mechanism is file-based it will automatically work with merges (except for occasional conflicts to resolve, of course). Personally, I think that handling cherry-picking and rebasing is very secondary. Stefan