* VC needs a mechanism to turn on smerge-mode in case of conflics
@ 2008-01-13 20:18 Dan Nicolaescu
2008-01-13 21:56 ` Stefan Monnier
0 siblings, 1 reply; 3+ messages in thread
From: Dan Nicolaescu @ 2008-01-13 20:18 UTC (permalink / raw)
To: emacs-devel
Currently smerge-mode gets turned on if emacs detects a conflict when
doing a merge/update. But if the merge is done from the command line or
some other tool, the version control system might know there's conflict.
But VC does not turn on smerge-mode when doing C-x C-f on a file with
conflicts.
It would be nice if there was a way to do this.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: VC needs a mechanism to turn on smerge-mode in case of conflics
2008-01-13 20:18 VC needs a mechanism to turn on smerge-mode in case of conflics Dan Nicolaescu
@ 2008-01-13 21:56 ` Stefan Monnier
2008-01-14 8:44 ` Dan Nicolaescu
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Monnier @ 2008-01-13 21:56 UTC (permalink / raw)
To: Dan Nicolaescu; +Cc: emacs-devel
> Currently smerge-mode gets turned on if emacs detects a conflict when
> doing a merge/update. But if the merge is done from the command line or
> some other tool, the version control system might know there's conflict.
> But VC does not turn on smerge-mode when doing C-x C-f on a file with
> conflicts.
> It would be nice if there was a way to do this.
Indeed. It already does that in the Arch and SVN backends.
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: VC needs a mechanism to turn on smerge-mode in case of conflics
2008-01-13 21:56 ` Stefan Monnier
@ 2008-01-14 8:44 ` Dan Nicolaescu
0 siblings, 0 replies; 3+ messages in thread
From: Dan Nicolaescu @ 2008-01-14 8:44 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
Stefan Monnier <monnier@iro.umontreal.ca> writes:
> > Currently smerge-mode gets turned on if emacs detects a conflict when
> > doing a merge/update. But if the merge is done from the command line or
> > some other tool, the version control system might know there's conflict.
> > But VC does not turn on smerge-mode when doing C-x C-f on a file with
> > conflicts.
> > It would be nice if there was a way to do this.
>
> Indeed. It already does that in the Arch and SVN backends.
I created a Todo section in vc.el and added this there.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-14 8:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-13 20:18 VC needs a mechanism to turn on smerge-mode in case of conflics Dan Nicolaescu
2008-01-13 21:56 ` Stefan Monnier
2008-01-14 8:44 ` Dan Nicolaescu
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).