From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: gnulib strftime imported into Emacs Date: Mon, 31 Jan 2011 11:56:01 -0500 Message-ID: References: <4D45F788.1020101@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1296493526 13825 80.91.229.12 (31 Jan 2011 17:05:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 31 Jan 2011 17:05:26 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 31 18:05:21 2011 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.69) (envelope-from ) id 1PjxBo-0006ZR-0t for ged-emacs-devel@m.gmane.org; Mon, 31 Jan 2011 18:05:20 +0100 Original-Received: from localhost ([127.0.0.1]:43732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PjxBn-0002rJ-8y for ged-emacs-devel@m.gmane.org; Mon, 31 Jan 2011 12:05:19 -0500 Original-Received: from [140.186.70.92] (port=39566 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjx32-0007AC-I3 for emacs-devel@gnu.org; Mon, 31 Jan 2011 11:56:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pjx31-0003bQ-DR for emacs-devel@gnu.org; Mon, 31 Jan 2011 11:56:16 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:18325 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pjx30-0003aq-6G; Mon, 31 Jan 2011 11:56:14 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAOd4Rk1MCpTp/2dsb2JhbACkeHS9Q4VOBIUTj2g X-IronPort-AV: E=Sophos;i="4.60,404,1291611600"; d="scan'208";a="89956514" Original-Received: from 76-10-148-233.dsl.teksavvy.com (HELO ceviche.home) ([76.10.148.233]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 31 Jan 2011 11:56:01 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 0E0BB660DC; Mon, 31 Jan 2011 11:56:01 -0500 (EST) In-Reply-To: (Eli Zaretskii's message of "Mon, 31 Jan 2011 09:56:29 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.183 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:135320 Archived-At: > It may still be possible to recover the lost information, by > temporarily restoring the old src/strftime.c and then using "bzr mv" > to replace it with the gnulib version. If someone knows how to do > that off-hand, please post the recipe. I've done just that in the following way: % bzr merge -r 103037..103036 % bzr revert