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, 30 Nov 2012 23:42:04 -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: ger.gmane.org 1354336983 13421 80.91.229.3 (1 Dec 2012 04:43:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 1 Dec 2012 04:43:03 +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 Sat Dec 01 05:43:15 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Teeuy-00085k-Jt for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Dec 2012 05:43:08 +0100 Original-Received: from localhost ([::1]:36152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Teeun-0001Ad-62 for geb-bug-gnu-emacs@m.gmane.org; Fri, 30 Nov 2012 23:42:57 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:59110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Teeuk-0001AQ-FX for bug-gnu-emacs@gnu.org; Fri, 30 Nov 2012 23:42:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Teeuj-0008Jw-KP for bug-gnu-emacs@gnu.org; Fri, 30 Nov 2012 23:42:54 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Teeuj-0008Js-Gn for bug-gnu-emacs@gnu.org; Fri, 30 Nov 2012 23:42:53 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Teewo-0004KJ-2r for bug-gnu-emacs@gnu.org; Fri, 30 Nov 2012 23:45: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: Sat, 01 Dec 2012 04:45: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.135433705516564 (code B ref 10709); Sat, 01 Dec 2012 04:45:02 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 1 Dec 2012 04:44:15 +0000 Original-Received: from localhost ([127.0.0.1]:47770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Teew3-0004J6-KR for submit@debbugs.gnu.org; Fri, 30 Nov 2012 23:44:15 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:34993) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Teew2-0004J0-IC for 10709@debbugs.gnu.org; Fri, 30 Nov 2012 23:44:14 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09FxKh9/2dsb2JhbABEtBGBCIIVAQEEAVYjBQsLDiYSFBgNJIgcBboJkEQDiEKacYFYgwc X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="208863506" Original-Received: from 69-196-168-125.dsl.teksavvy.com (HELO pastel.home) ([69.196.168.125]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 30 Nov 2012 23:42:04 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 71A1859069; Fri, 30 Nov 2012 23:42:04 -0500 (EST) In-Reply-To: (Glenn Morris's message of "Fri, 30 Nov 2012 20:12:54 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (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.x 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:67714 Archived-At: > The detection of a conflict is poor and Needs Work. With bzr we have Maybe we should ask on a Mercurial list how it can be done (and turn it into a feature request if there's no good answer)? Stefan