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: Error in BZR Wiki document? Date: Tue, 05 Jan 2010 16:01:29 +0100 Message-ID: <87aawsh9yu.fsf@telefonica.net> References: <4B434F61.6090305@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262703790 30823 80.91.229.12 (5 Jan 2010 15:03:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 5 Jan 2010 15:03:10 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 05 16:03:03 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 1NSAw2-0000WC-7l for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 16:03:03 +0100 Original-Received: from localhost ([127.0.0.1]:49562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAw1-0005sK-Mr for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 10:03:01 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSAvU-0005ZE-0E for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:02:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSAvP-0005Vr-D2 for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:02:27 -0500 Original-Received: from [199.232.76.173] (port=41732 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSAvP-0005Vk-6i for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:02:23 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:50300) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSAvN-00010r-Az for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:02:22 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NSAv6-00006z-IX for emacs-devel@gnu.org; Tue, 05 Jan 2010 16:02:04 +0100 Original-Received: from 217.red-88-24-214.staticip.rima-tde.net ([88.24.214.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 05 Jan 2010 16:02:04 +0100 Original-Received: from ofv by 217.red-88-24-214.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 05 Jan 2010 16:02:04 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 47 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 217.red-88-24-214.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) Cancel-Lock: sha1:tQpuzUU7SZXwMzpKpGE5OcyjAvM= 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:119433 Archived-At: Jan Djärv writes: > Quote: > "The merge may fail due to a change that conflicts with your > branch. You’ll need to fix the problem (looking for conflict markers > 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. > Hmm, lets remove -m then: > % bzr resolve ChangeLog > src/ChangeLog is not conflicted I think that when you open a conflicted file on Emacs, it activates SMerge and after you remove the conflict text markers and save the file, SMerge automatically does a `bzr resolve'. > What is bzr resolve supposed to do anyway? It prevents you from committing a conflicted file. > (BTW, pulling trunk again for 5 Mbytes worth of changes required 177 > Mbytes to download from the server). Hmmm... after the big 180 MB download a few hours ago, pulling again right now required 6 MB. I see nothing on the commits made by Stefan that justify a download of 177 MB, but maybe that hitted something on the internal storage of bzr that triggered a pessimization. -- Óscar