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: Tue, 04 Dec 2012 20:53:45 -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: ger.gmane.org 1354672450 17425 80.91.229.3 (5 Dec 2012 01:54:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 5 Dec 2012 01:54:10 +0000 (UTC) Cc: 10709@debbugs.gnu.org, Wolfgang Schnerring To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 05 02:54:22 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 1Tg4Bn-0001uK-F9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Dec 2012 02:54:19 +0100 Original-Received: from localhost ([::1]:58467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tg4Bb-0006S4-Gj for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 Dec 2012 20:54:07 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:44411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tg4BX-0006Rh-SY for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2012 20:54:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tg4BS-0007Co-9T for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2012 20:54:03 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tg4BS-0007Cj-5z for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2012 20:53:58 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Tg4BW-0003MB-Ct for bug-gnu-emacs@gnu.org; Tue, 04 Dec 2012 20:54:02 -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: Wed, 05 Dec 2012 01:54: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.135467243612891 (code B ref 10709); Wed, 05 Dec 2012 01:54:02 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 5 Dec 2012 01:53:56 +0000 Original-Received: from localhost ([127.0.0.1]:53879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tg4BQ-0003Lr-6e for submit@debbugs.gnu.org; Tue, 04 Dec 2012 20:53:56 -0500 Original-Received: from fencepost.gnu.org ([208.118.235.10]:53998) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tg4BN-0003Lj-46 for 10709@debbugs.gnu.org; Tue, 04 Dec 2012 20:53:54 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Tg4BF-0006mH-K8; Tue, 04 Dec 2012 20:53:45 -0500 X-Spook: cypherpunk TWA 2600 Magazine bomb ASDIC Mossad domestic X-Ran: ?vbr~~`9c*yJ>{$D0$p@B0_`S>Xt&l(LL+F.ikgm7gseO%cn"MD1xXJzSQABjHv^1AfbP@ X-Hue: green X-Attribution: GM In-Reply-To: (Stefan Monnier's message of "Fri, 30 Nov 2012 23:42:04 -0500") 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.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:67939 Archived-At: Stefan Monnier wrote: >> 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)? AFAICS they have set their face against it, eg http://bz.selenic.com/show_bug.cgi?id=2724 # RESOLVED FIXED I think checking for state = 'edited, plus .orig file, plus conflict markers is good enough for a start, so I installed that to trunk and we can see how it works out for people. BTW, I think this stuff should be abstracted to a general vc-find-file-hook/after-save-hook that calls vc-BACKEND-conflicted-p.