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 19:27:36 +0100 Message-ID: <20120203182736.GC1786@elzar.wosc.de> References: <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="MfFXiAuoTsnnDAfZ" X-Trace: dough.gmane.org 1328293721 18689 80.91.229.3 (3 Feb 2012 18:28:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Feb 2012 18:28:41 +0000 (UTC) Cc: 10709@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 03 19:28: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 1RtNsD-00053H-F2 for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 19:28:37 +0100 Original-Received: from localhost ([::1]:40431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNsC-0007Qr-Tl for geb-bug-gnu-emacs@m.gmane.org; Fri, 03 Feb 2012 13:28:36 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:52023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNsA-0007MZ-6H for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:28:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtNs4-0006Fc-EC for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:28:34 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtNs4-0006FS-Ci for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:28:28 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtNsc-0008Qr-1G for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2012 13:29:02 -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 18:29: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.132829369532342 (code B ref 10709); Fri, 03 Feb 2012 18:29:01 +0000 Original-Received: (at 10709) by debbugs.gnu.org; 3 Feb 2012 18:28:15 +0000 Original-Received: from localhost ([127.0.0.1]:52575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtNrq-0008Pb-TG for submit@debbugs.gnu.org; Fri, 03 Feb 2012 13:28:15 -0500 Original-Received: from pharos.wosc.de ([85.214.124.141]:50748) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtNrp-0008PT-5v for 10709@debbugs.gnu.org; Fri, 03 Feb 2012 13:28:14 -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 1RtNrF-0003dq-IK; Fri, 03 Feb 2012 19:27:37 +0100 Original-Received: from wosc by elzar with local (Exim 4.74) (envelope-from ) id 1RtNrE-0003nw-TP; Fri, 03 Feb 2012 19:27:36 +0100 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) 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:56439 Archived-At: --MfFXiAuoTsnnDAfZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Glenn Morris [2012-02-03 12:11]: > Glenn Morris wrote: > > I guess you need to get hg to generate standard conflict markers. Ref: You could configure diff3 as the default merge program. However, in my experience, using smerge-mode on the "internal:merge" results of hg worked, too. =20 > Actually I guess vc-hg would need some changes too. Yep, I guess you'd need changes on both ends. Wolfgang --MfFXiAuoTsnnDAfZ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFPLCcYYfWCHec7w7QRAozXAKCUnz7oaDReRZjmjfodAZKM7yCUMQCg5Ipm yKdpv2KcmogXQt0xpLlp/Qg= =Eg7j -----END PGP SIGNATURE----- --MfFXiAuoTsnnDAfZ--