From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: gnulib strftime imported into Emacs Date: Mon, 31 Jan 2011 09:44:31 -0500 Message-ID: References: <4D45F788.1020101@cs.ucla.edu> <83r5btg1td.fsf@gnu.org> <4D466C8D.2020102@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1296485092 29138 80.91.229.12 (31 Jan 2011 14:44:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 31 Jan 2011 14:44:52 +0000 (UTC) Cc: eggert@cs.ucla.edu, lennart.borgman@gmail.com, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 31 15:44:45 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 1Pjuzl-0007gT-72 for ged-emacs-devel@m.gmane.org; Mon, 31 Jan 2011 15:44:45 +0100 Original-Received: from localhost ([127.0.0.1]:57782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjuzk-00030O-MN for ged-emacs-devel@m.gmane.org; Mon, 31 Jan 2011 09:44:44 -0500 Original-Received: from [140.186.70.92] (port=35215 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pjuzd-0002zg-6l for emacs-devel@gnu.org; Mon, 31 Jan 2011 09:44:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pjuzc-00066N-2u for emacs-devel@gnu.org; Mon, 31 Jan 2011 09:44:37 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:37227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pjuzc-00066I-0B for emacs-devel@gnu.org; Mon, 31 Jan 2011 09:44:36 -0500 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1PjuzX-0002yz-OZ; Mon, 31 Jan 2011 09:44:31 -0500 In-reply-to: (message from Andreas Schwab on Mon, 31 Jan 2011 14:17:52 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:135306 Archived-At: > From: Andreas Schwab > Cc: Lennart Borgman , eggert@cs.ucla.edu, emacs-devel@gnu.org > Date: Mon, 31 Jan 2011 14:17:52 +0100 > > Eli Zaretskii writes: > > > It will prevent you from using all the revisions after 103046, yes. > > It is possible to do better by reverse cherry-picking r103047 (see > > "bzr help merge"), but I don't recommend that, since it will make your > > regular updates more complicated and error-prone, and the problem will > > be likely fixed soon. > > Though git makes it very easy to maintain such local changes. As does bzr, but if Lennart doesn't already know how to do that, I wouldn't suggest to learn now.