[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#10709: Feature request: vc-hg should activate smerge-mode for confli
From: |
Wolfgang Schnerring |
Subject: |
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts |
Date: |
Fri, 3 Feb 2012 17:30:29 +0100 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
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
Description: Digital signature
- bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts,
Wolfgang Schnerring <=
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts, Stefan Monnier, 2012/02/03