Martin Pool wrote:
>Hello,
>
>Following is a patch to improve vc-svn. It does not fix every outstanding
>issue, but after testing and discussion on the list I think it is an
>improvement. Please apply.
>
>Log entry:
>
>* tools/client-side/vc-svn.el (vc-svn-state): Avoid running "svn
> status -uv" to check the status of a file, because this causes
> network delays and is not really necessary, and also does not work
> on newly-added files in some releases of Subversion (issue #1042).
>
>* tools/client-side/vc-svn.el: Describe how to get svn support
> autoloaded by emacs. Document work that should be done to bring
> this up to the same standard as emacs vc-cvs support.
>
>* tools/client-side/vc-svn.el (vc-svn-merge-news): Implement vc-merge
> for Subversion. After merging updates, if any, cause vc to reload
> the file's base revision.
>
[snip]
>+(defun vc-svn-merge-news (file)
>+ "Merge recent changes into FILE.
>+
>+This calls `svn update'. In the case of conflicts, Subversion puts
>+conflict markers into the file and leaves additional temporary files
>+containing the `ancestor', `mine', and `other' files.
>+
>+You may need to run `svn resolve' by hand once these conflicts have
>+been resolved.
>+
>+Returns a vc status, which is used to determine whether conflicts need
>+to be merged."
>+ (prog1
>+ (vc-do-command nil 0 vc-svn-program-name file "update")
>
Couldn't we add an option here to run emerge for conflict resolution,
instead of leaving the user to stew in their own juice?
--
Brane Čibej <brane_at_xbc.nu> http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 27 08:26:39 2003