From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts Date: Fri, 03 Feb 2012 12:04:54 -0500 Message-ID: References: <20120203163029.GB1786@elzar.wosc.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1328288740 11907 80.91.229.3 (3 Feb 2012 17:05:40 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2012 17:05:40 +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 18:05:39 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 1RtMZt-0004uv-7A for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 18:05:37 +0100 Original-Received: from localhost ([::1]:59145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtMZs-0004WT-DG for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 12:05:36 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:37989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtMZl-0004UN-If for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 12:05:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtMZk-0005YL-FW for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 12:05:29 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtMZk-0005Y8-Do for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 12:05:28 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtMaH-0006JV-J0 for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 12:06:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Feb 2012 17:06: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.132828873224222 (code B ref 10709); Fri, 03 Feb 2012 17:06:01 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 3 Feb 2012 17:05:32 +0000 Original-Received: from localhost ([127.0.0.1]:52505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtMZn-0006Id-W4 for submit@debbugs.gnu.org; Fri, 03 Feb 2012 12:05:32 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:47872 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtMZl-0006IV-I2 for 10709@debbugs.gnu.org; Fri, 03 Feb 2012 12:05:30 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1RtMZC-0006Yw-GX; Fri, 03 Feb 2012 12:04:54 -0500 X-Spook: Project Monarch Blowfish Abbas AIMSX offensive X-Ran: 6n}:z}n5v'/9Kq,u\7>[Erf`$aGP.OD[+\Daq|^8Ett_h (Wolfgang Schnerring's message of "Fri, 3 Feb 2012 17:30:29 +0100") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:56428 Archived-At: Wolfgang Schnerring wrote: > 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