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: Mon, 06 Feb 2012 08:27:27 -0500 Message-ID: References: <20120203163029.GB1786@elzar.wosc.de> <20120203182736.GC1786@elzar.wosc.de> <20120204094629.GA1775@elzar.wosc.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328534908 14557 80.91.229.3 (6 Feb 2012 13:28:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 6 Feb 2012 13:28:28 +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 Mon Feb 06 14:28:27 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 1RuOcM-0001UN-Di for geb-bug-gnu-emacs@m.gmane.org; Mon, 06 Feb 2012 14:28:26 +0100 Original-Received: from localhost ([::1]:36526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuOcL-0003sM-U7 for geb-bug-gnu-emacs@m.gmane.org; Mon, 06 Feb 2012 08:28:25 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:57066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuOcE-0003s8-8Z for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2012 08:28:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RuOc8-0007GF-9q for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2012 08:28:18 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuOc8-0007G7-6H for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2012 08:28:12 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RuOcv-0001iH-TK for bug-gnu-emacs@gnu.org; Mon, 06 Feb 2012 08:29: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: Mon, 06 Feb 2012 13:29: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.13285349066541 (code B ref 10709); Mon, 06 Feb 2012 13:29:01 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 6 Feb 2012 13:28:26 +0000 Original-Received: from localhost ([127.0.0.1]:56486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RuOcL-0001hR-KW for submit@debbugs.gnu.org; Mon, 06 Feb 2012 08:28:25 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:6743) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RuOcJ-0001hF-SM for 10709@debbugs.gnu.org; Mon, 06 Feb 2012 08:28:24 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EACnUL09MCqD0/2dsb2JhbABDrziBBoFyAQEEAVYjBQsLDiYSFBgNJIgPuQSMDhICAgMGAgQCAQQCAgwGCgOEHgEEBB6DOQSIRJsDhFo X-IronPort-AV: E=Sophos;i="4.73,370,1325480400"; d="scan'208";a="161427130" 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; 06 Feb 2012 08:27:27 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 50F3E58C8C; Mon, 6 Feb 2012 08:27:27 -0500 (EST) In-Reply-To: <20120204094629.GA1775@elzar.wosc.de> (Wolfgang Schnerring's message of "Sat, 4 Feb 2012 10:46:29 +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:56553 Archived-At: >> So you're saying that hg uses standard conflict markers in its >> internal:merge code? Wonderful. > I've just double-checked: yes, it does. Here's an example of a file > with conflicts: > <<<<<<< local > foo = baz > ======= > foo = qux >>>>>>>> other > This matches the markers defined in smerge-mode, and invoking > smerge-mode manually on the example file works just fine, just as I > remembered. >> >> 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. > Yup, this brings me back to my original chain of thought: vc-hg needs > to learn to detect conflicted files, and the vc-find-file-hook needs > to be ported/abstracted from vc-svn. You can also check vc-bzr.el which has similar code. Stefan