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: Changes to emacs/lisp/ChangeLog,v Date: Sat, 02 Feb 2008 16:39:06 -0500 Message-ID: References: <87wspojipf.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1201988369 1464 80.91.229.12 (2 Feb 2008 21:39:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Feb 2008 21:39:29 +0000 (UTC) Cc: Emacs developers To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 02 22:39:51 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JLQ5P-0000JI-JK for ged-emacs-devel@m.gmane.org; Sat, 02 Feb 2008 22:39:43 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JLQ4x-0005M6-SW for ged-emacs-devel@m.gmane.org; Sat, 02 Feb 2008 16:39:15 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JLQ4s-0005IJ-P3 for emacs-devel@gnu.org; Sat, 02 Feb 2008 16:39:10 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JLQ4q-0005EZ-QD for emacs-devel@gnu.org; Sat, 02 Feb 2008 16:39:10 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JLQ4q-0005ES-Mb for emacs-devel@gnu.org; Sat, 02 Feb 2008 16:39:08 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JLQ4q-0003Jg-8Y for emacs-devel@gnu.org; Sat, 02 Feb 2008 16:39:08 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1JLQ4o-0002LP-Cv; Sat, 02 Feb 2008 16:39:06 -0500 X-Spook: Osama UOP Aladdin Geraldton Mossad broadside AK-47 X-Ran: Wzk>Ry$9SY^?Zt.fXnH._L*B;"6)r|ZfGXcin({TE0vK6j-$)CB0C*aV5b~uV'47e(f:PJ X-Hue: magenta X-Attribution: GM In-Reply-To: <87wspojipf.fsf@catnip.gol.com> (Miles Bader's message of "Sat, 02 Feb 2008 09:38:36 +0900") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:88057 Archived-At: Miles Bader wrote: > You're right that arguably the trunk entries should win in such a case, > but I doubt it really matters all that much. If somebody wants to clean > such things up, go ahead, I guess... Done. > Whoops, I didn't realize the Emacs ChangeLogs were set up to use UTC. I set the merge dates to 2008-02-01. >> Another oddity: vc-bzr.el certainly wasn't newly installed today, but >> the original changelog entry seems to be missing. Probably a pre-merge >> problem. > > Dunno. I found the original entry (perhaps I was just missing it) and deleted the merge entry.