From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Error in BZR Wiki document? Date: Tue, 05 Jan 2010 22:32:49 -0500 Message-ID: <87eim3nc0u.fsf@red-bean.com> References: <4B434F61.6090305@swipnet.se> <87aawsh9yu.fsf@telefonica.net> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262749898 12004 80.91.229.12 (6 Jan 2010 03:51:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Jan 2010 03:51:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 06 04:51:31 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.50) id 1NSMvg-0000iW-J2 for ged-emacs-devel@m.gmane.org; Wed, 06 Jan 2010 04:51:29 +0100 Original-Received: from localhost ([127.0.0.1]:60719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSMvg-0002sP-K4 for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 22:51:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSMdm-0007kK-DU for emacs-devel@gnu.org; Tue, 05 Jan 2010 22:32:58 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSMdh-0007d8-3Y for emacs-devel@gnu.org; Tue, 05 Jan 2010 22:32:57 -0500 Original-Received: from [199.232.76.173] (port=60442 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSMdg-0007cs-V7 for emacs-devel@gnu.org; Tue, 05 Jan 2010 22:32:53 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:52041) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSMdg-0006X2-KV for emacs-devel@gnu.org; Tue, 05 Jan 2010 22:32:52 -0500 Original-Received: from localhost ([127.0.0.1]:57071 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NSMdf-00032r-E3; Tue, 05 Jan 2010 21:32:51 -0600 In-Reply-To: <87aawsh9yu.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Tue, 05 Jan 2010 16:01:29 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.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:119494 Archived-At: =C3=93scar Fuentes writes: >Jan Dj=C3=A4rv writes: >> Quote: >> "The merge may fail due to a change that conflicts with your >> branch. You=E2=80=99ll need to fix the problem (looking for conflict mar= kers >> and editing, just as in CVS), then >> >> bzr resolve -m file-you-changed ... # Mark these conflicts >> as resolved. >> # Bazaar keeps track of >> unresolved conflicts, >> # and won't let you >> commit until all are resolved. >> >> " >> >> Ok, I edit ChangeLog and remove markers, then: >> >> % bzr resolve -m ChangeLog >> bzr: ERROR: no such option: -m > >Yup, that's an error on the document. I don't want to sound like a nagging uncle, but... did anyone *fix* the error? It's a wiki, after all :-). I see the "-m" is still there. I've removed it now. It took me literally twenty seconds from start to finish. -Karl