* changes to vc-update
@ 2008-01-13 20:09 Dan Nicolaescu
0 siblings, 0 replies; only message in thread
From: Dan Nicolaescu @ 2008-01-13 20:09 UTC (permalink / raw)
To: emacs-devel
I just checked in a change to vc-update to make it resolve conflicts in
case `merge-news' returned true. (Now doing C-x v + for a file under CVS
that has conflicts will turn on smerge-mode).
vc-cvs-merge-news seem to have had a bug for ever: in case of a conflict
(vc-cvs-command nil 0 file "update")
threw an error (because of the "0" arg), so the output of the command
was never parsed. So I changed "0" to nil.n
Some other commands in vc-cvs.el might have the same issue.
IMO these changes are OK, but it be nice if someone else would look over
them.
Thanks
--dan
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-13 20:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-13 20:09 changes to vc-update Dan Nicolaescu
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.