all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 10709@debbugs.gnu.org, Wolfgang Schnerring <wosc@wosc.de>
Subject: bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts
Date: Tue, 04 Dec 2012 20:53:45 -0500	[thread overview]
Message-ID: <vjk3sxmfh2.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwv38zqz8nx.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Fri, 30 Nov 2012 23:42:04 -0500")

Stefan Monnier wrote:

>> The detection of a conflict is poor and Needs Work. With bzr we have
>
> Maybe we should ask on a Mercurial list how it can be done (and turn it
> into a feature request if there's no good answer)?

AFAICS they have set their face against it, eg

http://bz.selenic.com/show_bug.cgi?id=2724  # RESOLVED FIXED

I think checking for state = 'edited, plus .orig file, plus conflict
markers is good enough for a start, so I installed that to trunk and we
can see how it works out for people.

BTW, I think this stuff should be abstracted to a general
vc-find-file-hook/after-save-hook that calls vc-BACKEND-conflicted-p.





      reply	other threads:[~2012-12-05  1:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-03 16:30 bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts Wolfgang Schnerring
2012-02-03 17:04 ` Glenn Morris
2012-02-03 17:11   ` Glenn Morris
2012-02-03 18:27     ` Wolfgang Schnerring
2012-02-03 19:32       ` Stefan Monnier
2012-02-04  9:46         ` Wolfgang Schnerring
2012-02-06 13:27           ` Stefan Monnier
2012-02-03 18:43   ` Stefan Monnier
2012-12-01  1:12 ` Glenn Morris
2012-12-01  4:42   ` Stefan Monnier
2012-12-05  1:53     ` Glenn Morris [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vjk3sxmfh2.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=10709@debbugs.gnu.org \
    --cc=monnier@iro.umontreal.ca \
    --cc=wosc@wosc.de \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.