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: Dieter Wilhelm <dieter <at> duenenhof-wilhelm.de>
To: 4280 <at> debbugs.gnu.org
Subject: bug#4280: 23.1.50; vc-update fails under conflicts
Date: Tue, 01 Sep 2009 00:22:19 +0200

Hi,

strange, at work I built an Emacs 23.1.1 from source and with it
vc-update/vc-merge for svn worked also under conflicts (vc evoked
smerge)!  Maybe this is an debian snapshot problem, I'm wondering how
to check this?

But then, there is also no mechanism in vc for svn (or emacs)
resolving the "conflicts" or removing the "conflict files".  I think
it would be the most convenient and logical when vc-next-action could
check whether there are "conflict files" and would do something in the
line of "svn resolve FILE" before trying to check in.

Best wishes

     Dieter
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.