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: Emacs trunk Date: Fri, 03 Dec 2010 17:15:12 -0500 Message-ID: References: <87lj467lme.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1291414543 21829 80.91.229.12 (3 Dec 2010 22:15:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Dec 2010 22:15:43 +0000 (UTC) Cc: Chong Yidong , Katsumi Yamaoka , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 03 23:15:37 2010 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 1POdui-00005L-Dk for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 23:15:36 +0100 Original-Received: from localhost ([127.0.0.1]:33880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POduh-0005yN-Lx for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 17:15:35 -0500 Original-Received: from [140.186.70.92] (port=35117 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POduP-0005ob-8a for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:15:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POduO-0004QO-Bg for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:15:17 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:40296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POduO-0004QK-AH for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:15:16 -0500 Original-Received: from localhost ([127.0.0.1]:58685) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1POduL-0006QO-6G; Fri, 03 Dec 2010 17:15:13 -0500 X-Spook: MD2 FIPS140 arrangements pre-emptive CESID NORAD radar X-Ran: h5 (Stefan Monnier's message of "Fri\, 03 Dec 2010 17\:07\:44 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/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:133362 Archived-At: Stefan Monnier wrote: > He also gave them different file-ids. So we should re-remove them and > then re-add them with "bzr add --file-ids-from" some older branch. > Or maybe just with something like "bzr merge -r 102572..102571". Plain old `bzr revert -r LAST-GOOD-REV configure.in' _seems_ to work...