From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: emacs-w3m? Date: Thu, 25 Feb 2010 21:52:45 +0100 Message-ID: <87r5o9yr4y.fsf@telefonica.net> References: <3E1D063D-AC8A-4E40-B9F8-6ACA5089C4A7@gmail.com> <873a0p1dqt.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1267131193 11475 80.91.229.12 (25 Feb 2010 20:53:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 25 Feb 2010 20:53:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Feb 25 21:53:06 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 1Nkkhl-0005gz-Qs for ged-emacs-devel@m.gmane.org; Thu, 25 Feb 2010 21:53:06 +0100 Original-Received: from localhost ([127.0.0.1]:35630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nkkhl-0005FN-EM for ged-emacs-devel@m.gmane.org; Thu, 25 Feb 2010 15:53:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nkkhh-0005F7-6i for emacs-devel@gnu.org; Thu, 25 Feb 2010 15:53:01 -0500 Original-Received: from [140.186.70.92] (port=45626 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nkkhg-0005Ez-FA for emacs-devel@gnu.org; Thu, 25 Feb 2010 15:53:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nkkhf-0006Yc-TF for emacs-devel@gnu.org; Thu, 25 Feb 2010 15:53:00 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:35173) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nkkhf-0006YO-3H for emacs-devel@gnu.org; Thu, 25 Feb 2010 15:52:59 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Nkkhd-0005dy-QP for emacs-devel@gnu.org; Thu, 25 Feb 2010 21:52:57 +0100 Original-Received: from 83.32.115.245 ([83.32.115.245]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 25 Feb 2010 21:52:57 +0100 Original-Received: from ofv by 83.32.115.245 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 25 Feb 2010 21:52:57 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 34 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.32.115.245 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (gnu/linux) Cancel-Lock: sha1:nQvFLugSY5ye9T1a0CDin8KNQkI= 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:121374 Archived-At: bob@gnu.org Robert J. Chassell) writes: > No, I did not `bzr add'; I followed the instructions in > BzrForEmacsDevs and BzrQuickStartForEmacsDevs. I did start W3m mode > in my Emacs, but why those files got committed to the master, I don't > know. Last time I looked, it wasn't a good idea to mix the instructions of those documents. Stick to one or another, but not both. Definitely, those files were added with `bzr add'. You did it inadvertently. The guides you use have very explicit steps for describing their respective workflows. Knowing what you exectly did (if you remember) would be useful, just to consider rewriting the parts that could be the cause of the confusion. > David Reitter is right, > > The consequences get worse in proportion to the time span between the = > faulty commit and the history manipulation. > > What are the `unthinkable' ways of removing unwanted files? I'm not sure I understand your question. With bzr, you do `bzr uncommit --revision N'. DON'T EVER DO THAT ON A PUBLIC BRANCH unless you want to screw other's local mirrors. If you are not completely sure that you are working on a local branch, don't use `uncommit'. Fortunately, there is a setting on the FSF bzr repo that will not allow you to uncommit something from it, but just in case that setting's implementation has bugs, don't try it. > What do you do when you make a mistake? You commit the reverse patch.