From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Fri, 28 Nov 2014 23:20:54 -0800 Organization: UCLA Computer Science Department Message-ID: <547973D6.9040806@cs.ucla.edu> 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> <87ioi05fom.fsf@lifelogs.com> 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 1417245710 28059 80.91.229.3 (29 Nov 2014 07:21:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Nov 2014 07:21:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 29 08:21:43 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 1XucLe-0007L5-28 for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 08:21:42 +0100 Original-Received: from localhost ([::1]:46942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XucLd-0003ve-H9 for ged-emacs-devel@m.gmane.org; Sat, 29 Nov 2014 02:21:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XucLJ-0003uL-NI for emacs-devel@gnu.org; Sat, 29 Nov 2014 02:21:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XucLC-0000nV-8T for emacs-devel@gnu.org; Sat, 29 Nov 2014 02:21:21 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:34767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XucLC-0000mS-2h for emacs-devel@gnu.org; Sat, 29 Nov 2014 02:21:14 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id B9131A60001 for ; Fri, 28 Nov 2014 23:21:06 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5FaKyQCknH5q for ; Fri, 28 Nov 2014 23:20:58 -0800 (PST) Original-Received: from [192.168.1.9] (pool-71-177-17-123.lsanca.dsl-w.verizon.net [71.177.17.123]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 19E97A6000B for ; Fri, 28 Nov 2014 23:20:58 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 In-Reply-To: <87ioi05fom.fsf@lifelogs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:178445 Archived-At: Ted Zlatanov wrote: > it's only going to get harder to revert my "stupid" commit as more > commits pile on I attempted to finish up the merge, and bring it up to date with the latest master and emacs-24 branches, without reverting anything (in the git sense), as git commit 0cce3623b169732a51f055a86fc926313b11a5ee on the master branch. I did this by hand. Please let me know of any errors.