From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org, Dmitry Gutov <dgutov@yandex.ru>
Subject: Re: Git conflict VC state detection
Date: Sun, 10 Nov 2013 19:16:56 -0500 [thread overview]
Message-ID: <jwvy54vstft.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87ppq7zyqx.fsf@wanadoo.es> ("Óscar Fuentes"'s message of "Sun, 10 Nov 2013 23:19:02 +0100")
> I'm not myself happy with the solution. It all depends on how important
> it is to know the `conflict' status. Maybe other features on Emacs VC
> depends on it.
The feature that depends on this information is to automatically enable
smerge-mode when there's a conflict and to automatically mark the
conflicts as resolved when there are no more diff3 markers (see how
it's done is vc-svn.el and vc-bzr.el).
So, an alternative to fixing vc-state is to add a vc-git-conflict-p called
from the find-file-hook.
Another useful feature along those lines is to add support for
vc-find-conflicted-file.
Stefan
next prev parent reply other threads:[~2013-11-11 0:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 17:08 Two feature ideas for diffs Tom
2013-11-07 17:25 ` nhs
2013-11-07 17:39 ` Tom
2013-11-07 17:58 ` Dmitry Gutov
2013-11-07 18:24 ` Tom
2013-11-07 19:09 ` Stefan Monnier
2013-11-07 19:30 ` Dmitry Gutov
2013-11-07 20:00 ` Stefan Monnier
2013-11-08 22:58 ` Michael Heerdegen
2013-11-09 2:30 ` Óscar Fuentes
2013-11-09 2:59 ` Michael Heerdegen
2013-11-09 13:34 ` Stefan Monnier
2013-11-09 22:58 ` Michael Heerdegen
2013-11-09 13:37 ` Stefan Monnier
2013-11-09 15:02 ` Óscar Fuentes
2013-11-10 13:24 ` Stefan Monnier
2013-11-10 20:30 ` Git conflict VC state detection Óscar Fuentes
2013-11-10 21:26 ` Dmitry Gutov
2013-11-10 22:19 ` Óscar Fuentes
2013-11-11 0:16 ` Stefan Monnier [this message]
2013-11-11 0:53 ` Óscar Fuentes
2013-11-11 2:13 ` Stefan Monnier
2013-11-11 23:16 ` Dmitry Gutov
2013-11-07 18:11 ` Two feature ideas for diffs Dmitry Gutov
2013-11-07 18:33 ` Tom
2013-11-08 1:29 ` Ivan Andrus
2013-11-07 19:11 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvy54vstft.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).