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: Error in BZR Wiki document? Date: Tue, 05 Jan 2010 10:45:55 -0500 Message-ID: References: <4B434F61.6090305@swipnet.se> <87aawsh9yu.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262706379 8584 80.91.229.12 (5 Jan 2010 15:46:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 5 Jan 2010 15:46:19 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 05 16:46:12 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 1NSBbn-00079X-CG for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 16:46:11 +0100 Original-Received: from localhost ([127.0.0.1]:34897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSBbn-0007dL-Jx for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 10:46:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSBbh-0007bK-DR for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:46:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSBbc-0007Un-P0 for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:46:04 -0500 Original-Received: from [199.232.76.173] (port=58528 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSBbc-0007UR-1w for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:46:00 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:64484 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSBba-0004NX-V8 for emacs-devel@gnu.org; Tue, 05 Jan 2010 10:45:59 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjwFAMPtQkvO+KPG/2dsb2JhbACBRdIzhDAEiik X-IronPort-AV: E=Sophos;i="4.47,506,1257138000"; d="scan'208";a="53002862" Original-Received: from 206-248-163-198.dsl.teksavvy.com (HELO ceviche.home) ([206.248.163.198]) by ironport2-out.pppoe.ca with ESMTP; 05 Jan 2010 10:45:55 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id AB5CDB4077; Tue, 5 Jan 2010 10:45:55 -0500 (EST) In-Reply-To: <87aawsh9yu.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= 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: 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:119440 Archived-At: > 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'. Indeed, except it's VC which does it, not SMerge. >> What is bzr resolve supposed to do anyway? > It prevents you from committing a conflicted file. Or rather Bzr prevents you from committing a conflicted file, so you have to tell it when you're resolved a conflict. Stefan