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 13:43:01 -0500 Message-ID: References: <20120203163029.GB1786@elzar.wosc.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328294621 25300 80.91.229.3 (3 Feb 2012 18:43:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2012 18:43:41 +0000 (UTC) Cc: 10709@debbugs.gnu.org, Wolfgang Schnerring To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 03 19:43:40 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 1RtO6f-0005En-DQ for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 19:43:33 +0100 Original-Received: from localhost ([::1]:54584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtO6e-0002gW-VE for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 13:43:32 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:53812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtO6b-0002fx-VH for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:43:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtO6a-0001dY-LS for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:43:29 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtO6a-0001dU-IE for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:43:28 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtO78-0000Md-9D for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:44:02 -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 18:44:02 +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.13282946261371 (code B ref 10709); Fri, 03 Feb 2012 18:44:02 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 3 Feb 2012 18:43:46 +0000 Original-Received: from localhost ([127.0.0.1]:52603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtO6s-0000M3-FY for submit@debbugs.gnu.org; Fri, 03 Feb 2012 13:43:46 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:22495) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtO6o-0000LT-6Z for 10709@debbugs.gnu.org; Fri, 03 Feb 2012 13:43:46 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAHApLE9MCqD0/2dsb2JhbABDryaBBoFyAQEBAQIBAQJTIxALDiYSFBQEDSSIDwm4VQSMARICAgMGAgQCAQQCAgwGCgMBhB0BBAQegzkEiESKPJBEhFo X-IronPort-AV: E=Sophos;i="4.73,352,1325480400"; d="scan'208";a="161098769" 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 13:43:02 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id ED26B590EC; Fri, 3 Feb 2012 13:43:01 -0500 (EST) In-Reply-To: (Glenn Morris's message of "Fri, 03 Feb 2012 12:04:54 -0500") 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:56441 Archived-At: >> vc-svn has the useful behaviour (via vc-svn-find-file-hook) that when >> you visit a file with conflicts, it drops you into smerge-mode, and >> automatically marks the file as resolved once you've removed all >> conflict markers. This makes for a very seamless editing experience. :-) >> It would be nice if vc-hg did the same. > I guess you need to get hg to generate standard conflict markers. Ref: > https://lists.ubuntu.com/archives/bazaar/2012q1/074313.html Note: I do not know that hg uses non-standard conflict markers. Stefan