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: Emacs trunk Date: Fri, 03 Dec 2010 17:50:38 -0500 Message-ID: References: <87lj467lme.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1291416654 30787 80.91.229.12 (3 Dec 2010 22:50:54 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Dec 2010 22:50:54 +0000 (UTC) Cc: Chong Yidong , Katsumi Yamaoka , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 03 23:50:49 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 1POeSn-0005bK-5j for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 23:50:49 +0100 Original-Received: from localhost ([127.0.0.1]:40338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POeSm-00011P-NV for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 17:50:48 -0500 Original-Received: from [140.186.70.92] (port=34767 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POeSh-00011H-Cx for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:50:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POeSg-0003dZ-2H for emacs-devel@gnu.org; Fri, 03 Dec 2010 17:50:43 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:50703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POeSf-0003cu-1Q; Fri, 03 Dec 2010 17:50:41 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id oB3MoctS029417; Fri, 3 Dec 2010 17:50:39 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 21D60A8364; Fri, 3 Dec 2010 17:50:38 -0500 (EST) In-Reply-To: (Glenn Morris's message of "Fri, 03 Dec 2010 17:15:12 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3698=0 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:133374 Archived-At: >> 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... Could be that it works as well, but "bzr merge -r 102572..102571" is the standard way to undo a commit (and before committing this undo, you can of course edit as much as you want so as to only undo part of the commit, or add new changes on top of the undo, ...). And it will show you conflicts so you know where you need to check that you're not accidentally undoing more than expected. Stefan