From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts Date: Fri, 03 Feb 2012 14:32:38 -0500 Message-ID: References: <20120203163029.GB1786@elzar.wosc.de> <20120203182736.GC1786@elzar.wosc.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328297613 15099 80.91.229.3 (3 Feb 2012 19:33:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2012 19:33:33 +0000 (UTC) Cc: 10709@debbugs.gnu.org To: Wolfgang Schnerring Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 03 20:33:31 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RtOt1-0007rm-C0 for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 20:33:31 +0100 Original-Received: from localhost ([::1]:44118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtOt0-0003d8-P9 for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 14:33:30 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:55714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtOsy-0003d3-Nb for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 14:33:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtOsx-0004Px-Pg for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 14:33:28 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtOsx-0004Pt-OD for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 14:33:27 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtOtV-0001dd-OD for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 14:34:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Feb 2012 19:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10709 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10709-submit@debbugs.gnu.org id=B10709.13282976016239 (code B ref 10709); Fri, 03 Feb 2012 19:34:01 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 3 Feb 2012 19:33:21 +0000 Original-Received: from localhost ([127.0.0.1]:52701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtOsr-0001ca-8u for submit@debbugs.gnu.org; Fri, 03 Feb 2012 14:33:21 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:36004) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtOsp-0001cM-Lf for 10709@debbugs.gnu.org; Fri, 03 Feb 2012 14:33:20 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EACo1LE9MCqD0/2dsb2JhbABDryaBBoFyAQEEAVYjEAsOJhIUGA0kiA+4ZowBEgICAwYCBAIBBAICDAYKAwGEHQEEBB6DOQSIRJsAhFo X-IronPort-AV: E=Sophos;i="4.73,352,1325480400"; d="scan'208";a="161105683" Original-Received: from 76-10-160-244.dsl.teksavvy.com (HELO pastel.home) ([76.10.160.244]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 03 Feb 2012 14:32:39 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id C2825590EC; Fri, 3 Feb 2012 14:32:38 -0500 (EST) In-Reply-To: <20120203182736.GC1786@elzar.wosc.de> (Wolfgang Schnerring's message of "Fri, 3 Feb 2012 19:27:36 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:56445 Archived-At: >> > I guess you need to get hg to generate standard conflict markers. Ref: > You could configure diff3 as the default merge program. > However, in my experience, using smerge-mode on the "internal:merge" > results of hg worked, too. So you're saying that hg uses standard conflict markers in its internal:merge code? Wonderful. >> Actually I guess vc-hg would need some changes too. > Yep, I guess you'd need changes on both ends. Apparently only vc-hg.el needs to be changed, then. Stefan