From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?SmFuIERqw6Rydg==?= Newsgroups: gmane.emacs.devel Subject: Error in BZR Wiki document? Date: Tue, 05 Jan 2010 15:40:33 +0100 Message-ID: <4B434F61.6090305@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: Quoted-Printable X-Trace: ger.gmane.org 1262702518 26072 80.91.229.12 (5 Jan 2010 14:41:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 5 Jan 2010 14:41:58 +0000 (UTC) To: Emacs-Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 05 15:41:51 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from terminus-est.gnu.org ([66.92.78.210] helo=lists.gnu.org) by lo.gmane.org with esmtp (Exim 4.50) id 1NSAbX-00082A-1p for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 15:41:51 +0100 Original-Received: from localhost ([127.0.0.1]:47181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAbX-0000vE-Im for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 09:41:51 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSAaP-0008Te-W0 for emacs-devel@gnu.org; Tue, 05 Jan 2010 09:40:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSAaK-0008PT-8O for emacs-devel@gnu.org; Tue, 05 Jan 2010 09:40:40 -0500 Original-Received: from [199.232.76.173] (port=38127 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAaK-0008PI-0y for emacs-devel@gnu.org; Tue, 05 Jan 2010 09:40:36 -0500 Original-Received: from proxy2.bredband.net ([195.54.101.72]:32898) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSAaJ-00049i-7r for emacs-devel@gnu.org; Tue, 05 Jan 2010 09:40:35 -0500 Original-Received: from ipb1.telenor.se (195.54.127.164) by proxy2.bredband.net (7.3.140.3) id 4AD3E1BC022A0C71 for emacs-devel@gnu.org; Tue, 5 Jan 2010 15:40:33 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArQ5ANLdQktV4S1uPGdsb2JhbACBRYIahFeTHAEBAQE3qXeNUoEsgi5WBA X-IronPort-AV: E=Sophos;i="4.47,505,1257116400"; d="scan'208";a="23467560" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb1.telenor.se with ESMTP; 05 Jan 2010 15:40:33 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 1DE9A7FA07B for ; Tue, 5 Jan 2010 15:40:33 +0100 (CET) User-Agent: Thunderbird 2.0.0.23 (X11/20090817) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:119432 Archived-At: Quote: "The merge may fail due to a change that conflicts with your branch. You=E2= =80=99ll=20 need to fix the problem (looking for conflict markers and editing, just a= s in=20 CVS), then bzr resolve -m file-you-changed ... # Mark these conflicts as= =20 resolved. # Bazaar keeps track of=20 unresolved conflicts, # and won't let you commi= t=20 until all are resolved. " Ok, I edit ChangeLog and remove markers, then: % bzr resolve -m ChangeLog bzr: ERROR: no such option: -m Hmm, lets remove -m then: % bzr resolve ChangeLog src/ChangeLog is not conflicted What is bzr resolve supposed to do anyway? Jan D. (BTW, pulling trunk again for 5 Mbytes worth of changes required 177 Mbyt= es to=20 download from the server).