From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs/lisp/ChangeLog,v Date: Sat, 02 Feb 2008 09:38:36 +0900 Message-ID: <87wspojipf.fsf@catnip.gol.com> References: Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1201912744 10168 80.91.229.12 (2 Feb 2008 00:39:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Feb 2008 00:39:04 +0000 (UTC) Cc: Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 02 01:39:25 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 1JL6Pk-0003ob-FO for ged-emacs-devel@m.gmane.org; Sat, 02 Feb 2008 01:39:24 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JL6PI-0008MQ-SK for ged-emacs-devel@m.gmane.org; Fri, 01 Feb 2008 19:38:56 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JL6PF-0008JC-6e for emacs-devel@gnu.org; Fri, 01 Feb 2008 19:38:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JL6PA-0008CG-BC for emacs-devel@gnu.org; Fri, 01 Feb 2008 19:38:52 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JL6PA-0008C2-76 for emacs-devel@gnu.org; Fri, 01 Feb 2008 19:38:48 -0500 Original-Received: from smtp11.dentaku.gol.com ([203.216.5.73]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JL6P2-0007J4-Qn; Fri, 01 Feb 2008 19:38:41 -0500 Original-Received: from 203-216-97-023.dsl.gol.ne.jp ([203.216.97.23] helo=catnip.gol.com) by smtp11.dentaku.gol.com with esmtpa (Dentaku) id 1JL6P0-0002mQ-HN; Sat, 02 Feb 2008 09:38:38 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 40EFCFB2; Sat, 2 Feb 2008 09:38:37 +0900 (JST) System-Type: i686-pc-linux-gnu In-Reply-To: (Glenn Morris's message of "Fri, 01 Feb 2008 19:22:45 -0500") Original-Lines: 32 X-Virus-Scanned: ClamAV GOL (outbound) X-Abuse-Complaints: abuse@gol.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) 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:87972 Archived-At: Glenn Morris writes: > I think you deleted the wrong duplicate entries here - it should have > been the 2008-02-02 ones that went. I think Vinicius was one of the > few people making changes on both trunk and unicode-2 by hand. (Just > to make it more fun, I don't know if some changes were only made on > unicode). I didn't delete those by hand, the "2008-02-02 entries" came from the unicode branch (where they originally had a date roughly similar to the trunk entries), and I had removed the redundant trunk entries when previously merging the trunk into the unicode branch. 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... > Also, aren't your log entries off by a day? It was 2008-02-01 UTC when > you made the merge. Whoops, I didn't realize the Emacs ChangeLogs were set up to use UTC. > 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. -Miles -- Bacchus, n. A convenient deity invented by the ancients as an excuse for getting drunk.