GNU bug report logs -
#12757
24.2.50; vc-svn-merge-news: Couldn't analyze svn update result
Previous Next
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Tags: patch
In GNU Emacs 24.2.50.5 (i686-pc-cygwin)
of 2012-10-29 on zeroset
Bzr revision: 110709 monnier <at> iro.umontreal.ca-20121028204149-1s63clufiecqd05k
Windowing system distributor `Microsoft Corp.', version 0.0.0
Configured using:
`configure '--without-all' '--without-x' '--with-w32' '--with-gnutls'
'--with-xml2' '--with-xpm' '--with-jpeg' '--with-tiff' '--with-gif'
'--with-png' '--with-rsvg' '--enable-check-lisp-object-type'
'CFLAGS=-ggdb3 -O2''
with svn, version 1.7.7 (r1393599)
compiled Oct 10 2012, 10:19:48
VC back-end for SVN fails to parse the merge response when the target file
is in the subdirectory.
In *vc-dir* buffer:
VC backend : SVN
Working dir: ~/Checkout/googlecode.com/zxing-read-only/
Repository : http://zxing.googlecode.com/svn
needs-merge core/src/com/google/zxing/MultiFormatReader.java
error "Couldn't analyze svn update result" occurs by pressing `+'
on the `needs-merge' line.
corresponding messages:
Merging changes into /home/foo/Checkout/googlecode.com/zxing-read-only/core/src/com/google/zxing/MultiFormatReader.java...
vc-svn-merge-news: Couldn't analyze svn update result
*vc* buffer is as follows:
Updating 'core/src/com/google/zxing/MultiFormatReader.java':
G core/src/com/google/zxing/MultiFormatReader.java
Updated to revision 2482.
[vc-svn-merge-news.diff (application/octet-stream, attachment)]
This bug report was last modified 12 years and 193 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.