From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: trunk r112949: Merge: Doc fix for VC. Date: Thu, 13 Jun 2013 01:29:39 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1371101383 22721 80.91.229.3 (13 Jun 2013 05:29:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Jun 2013 05:29:43 +0000 (UTC) Cc: emacs-devel To: Xue Fuqiao Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 13 07:29:44 2013 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 1Un06R-0007Zu-HA for ged-emacs-devel@m.gmane.org; Thu, 13 Jun 2013 07:29:43 +0200 Original-Received: from localhost ([::1]:34500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un06R-0003hS-5J for ged-emacs-devel@m.gmane.org; Thu, 13 Jun 2013 01:29:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un06O-0003hN-II for emacs-devel@gnu.org; Thu, 13 Jun 2013 01:29:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un06N-0005q2-Ro for emacs-devel@gnu.org; Thu, 13 Jun 2013 01:29:40 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un06N-0005px-OV for emacs-devel@gnu.org; Thu, 13 Jun 2013 01:29:39 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Un06N-0001tl-4b; Thu, 13 Jun 2013 01:29:39 -0400 X-Spook: nuclear rail gun CISU Jiang Zemin ISEC Compsec SCUD X-Ran: 12)E~=0Q1+?Rh"tR:P1zOnIl+vzW\V+Vme|0y->{pq>Q%L2R+~yU-8[t):2BrEp%1&3!=k X-Hue: yellow X-Attribution: GM In-Reply-To: (Xue Fuqiao's message of "Thu, 13 Jun 2013 06:25:30 +0800") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:160400 Archived-At: Xue Fuqiao wrote: >> Please put ChangeLog entries at the top of the file (bzr's >> changelog_merge plugin can help with this), with the date the date that >> you commit the change to Emacs. Thanks. (BTW, there's also admin/bzrmerge.el.) > I see. Do I need to fix the previous ChangeLog entries? Yes please.