GNU bug report logs - #4280
23.1.50; vc-update fails under conflicts

Previous Next

Package: emacs;

Reported by: Dieter Wilhelm <dieter <at> duenenhof-wilhelm.de>

Date: Fri, 28 Aug 2009 05:50:04 UTC

Severity: normal

Done: Glenn Morris <rgm <at> gnu.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Glenn Morris <rgm <at> gnu.org>
To: 4280 <at> debbugs.gnu.org
Subject: bug#4280: vc-update fails under conflicts
Date: Tue, 26 Jan 2010 21:48:55 -0500

Dieter Wilhelm wrote:

> When using vc-update I'm receiving the following error message in *vc*:
>
>   Conflict discovered in 'ansys-mode.el'.
>   Select: (p) postpone, (df) diff-full, (e) edit,
>           (h) help for more options: svn: Can't read stdin: End of file found

It seems that in recent versions of svn, `svn update' defaults to
offering this "interactive conflict resolution". It can be disabled by
passing the --non-interactive option to svn. This option seems to have
been first added to svn in 2002, so it's probably fine to use this
unconditionally in vc-svn.el.
This bug report was last modified 15 years and 177 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.