From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Wolfgang Schnerring Newsgroups: gmane.emacs.bugs Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts Date: Fri, 3 Feb 2012 17:30:29 +0100 Message-ID: <20120203163029.GB1786@elzar.wosc.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W/nzBZO5zC0uMSeA" X-Trace: dough.gmane.org 1328286706 27503 80.91.229.3 (3 Feb 2012 16:31:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2012 16:31:46 +0000 (UTC) To: 10709@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 03 17:31:46 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 1RtM35-00014S-In for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 17:31:43 +0100 Original-Received: from localhost ([::1]:39909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM35-00074o-2u for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 11:31:43 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:42984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM2y-00074O-1S for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:31:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtM2q-0005Ea-NP for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:31:35 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM2q-0005ES-Lm for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:31:28 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtM3N-0005VC-Sn for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Wolfgang Schnerring Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Feb 2012 16:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 10709 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.132828668921108 (code B ref -1); Fri, 03 Feb 2012 16:32:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 3 Feb 2012 16:31:29 +0000 Original-Received: from localhost ([127.0.0.1]:52471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtM2q-0005UO-IG for submit@debbugs.gnu.org; Fri, 03 Feb 2012 11:31:29 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:49040) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtM2n-0005U3-Ph for submit@debbugs.gnu.org; Fri, 03 Feb 2012 11:31:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtM2A-000585-AD for submit@debbugs.gnu.org; Fri, 03 Feb 2012 11:30:47 -0500 Original-Received: from lists.gnu.org ([140.186.70.17]:39622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM2A-000581-8Y for submit@debbugs.gnu.org; Fri, 03 Feb 2012 11:30:46 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:42777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM28-0006hX-9Z for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:30:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtM1x-00055i-H7 for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:30:44 -0500 Original-Received: from pharos.wosc.de ([85.214.124.141]:55444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtM1x-00054x-8t for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 11:30:33 -0500 Original-Received: from hlle-4db8adb8.pool.mediaways.net ([77.184.173.184] helo=elzar) by pharos.wosc.de with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1RtM1u-00038Z-7m for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 17:30:30 +0100 Original-Received: from wosc by elzar with local (Exim 4.74) (envelope-from ) id 1RtM1t-000380-LS for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 17:30:29 +0100 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:56426 Archived-At: --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, 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 most of the behaviour can be lifted straight from vc-svn, however I didn't find anything to suggest that vc-hg talks to "hg resolve -l" at the moment, which is needed to find out whether the current file is conflicted. So I guess that would be the starting point. My elisp is rather weak, so I probably won't be of much help here, but do let me know if there's something I can do. Wolfgang --W/nzBZO5zC0uMSeA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFPLAulYfWCHec7w7QRAj6KAJ4hK/Bkg+It7x3c+1g3zq6w8v9dwQCgqXfP U2lWuZBxKMpo1VKTIHGK4wg= =HAXb -----END PGP SIGNATURE----- --W/nzBZO5zC0uMSeA--