From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 19:31:21 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87ioi05fom.fsf@lifelogs.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417135227 31236 80.91.229.3 (28 Nov 2014 00:40:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 00:40:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 01:40:20 2014 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 1Xu9bg-0006S5-FP for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 01:40:20 +0100 Original-Received: from localhost ([::1]:42115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9bg-000731-0U for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 19:40:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9bX-00072r-31 for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:40:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu9bR-00076J-1u for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:40:11 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:54029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9bQ-00074g-S8 for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:40:04 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xu9bQ-0006Ma-5Z for emacs-devel@gnu.org; Fri, 28 Nov 2014 01:40:04 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:40:04 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:40:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 12 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:AHzZFidoFAOYctlcvT7Ynqwesuw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178390 Archived-At: On Thu, 27 Nov 2014 08:02:12 -0500 Ted Zlatanov wrote: TZ> I can revert my merge commit for the reasons Andreas and Glenn listed, TZ> or it can be patched up. Reverting is probably better to keep the TZ> ChangeLogs clean. Let me know, or go ahead and revert directly (it will TZ> have a few conflicts, nothing too bad). Maybe this question was lost in the helpful discussion of merging, but it's only going to get harder to revert my "stupid" commit as more commits pile on. Ted