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 18:38:44 -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 1371163130 3570 80.91.229.3 (13 Jun 2013 22:38:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Jun 2013 22:38:50 +0000 (UTC) Cc: emacs-devel To: Xue Fuqiao Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 14 00:38:51 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 1UnGAM-0004K9-Ec for ged-emacs-devel@m.gmane.org; Fri, 14 Jun 2013 00:38:50 +0200 Original-Received: from localhost ([::1]:46938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnGAL-0004Mw-Sq for ged-emacs-devel@m.gmane.org; Thu, 13 Jun 2013 18:38:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnGAI-0004Mb-KO for emacs-devel@gnu.org; Thu, 13 Jun 2013 18:38:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UnGAH-0007NN-Aa for emacs-devel@gnu.org; Thu, 13 Jun 2013 18:38:46 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UnGAH-0007NI-71 for emacs-devel@gnu.org; Thu, 13 Jun 2013 18:38:45 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1UnGAG-00056F-DL; Thu, 13 Jun 2013 18:38:44 -0400 X-Spook: top secret Verisign USCOI Albright IRA Gazprom 64 X-Ran: <~SLy$#&`|`Uj4kopm)9F9jnd\-BE8[:vqC#H3Z^mdNr]'4fI+cVI>iC:T0[S(#rG8,6WX X-Hue: cyan X-Attribution: GM In-Reply-To: (Xue Fuqiao's message of "Fri, 14 Jun 2013 06:34:45 +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:160426 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. > > Done as r112977. Thatnks, but you still need to fix the date to be the (UTC) date that you committed to Emacs.