GNU bug report logs - #10709
Feature request: vc-hg should activate smerge-mode for conflicts

Previous Next

Full log

View this message in rfc822 format

From: Wolfgang Schnerring <wosc <at> wosc.de>
To: 10709 <at> debbugs.gnu.org
Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts
Date: Fri, 3 Feb 2012 17:30:29 +0100

[Message part 1 (text/plain, 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.