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

From: OKAZAKI Tetsurou <okazaki.tetsurou <at> gmail.com>
To: Andreas Schwab <schwab <at> linux-m68k.org>
Cc: 12757 <at> debbugs.gnu.org, OKAZAKI Tetsurou <okazaki.tetsurou <at> gmail.com>
Subject: bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update result
Date: Sat, 03 Nov 2012 04:42:42 +0900

At Mon, 29 Oct 2012 09:43:50 +0100,
Andreas Schwab wrote:
> 
> OKAZAKI Tetsurou <okazaki.tetsurou <at> gmail.com> writes:
> 
> > === modified file 'lisp/vc/vc-svn.el'
> > *** lisp/vc/vc-svn.el	2012-02-25 04:29:09 +0000
> > --- lisp/vc/vc-svn.el	2012-10-29 00:12:43 +0000
> > ***************
> > *** 399,405 ****
> >                  ;; We also used to match the filename in column 0 without any
> >                  ;; meta-info before it, but I believe this can never happen.
> >                  (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)?  \\)"
> > !                        (regexp-quote (file-name-nondirectory file)))
> >                  nil t)
> >                 (cond
> >                  ;; Merge successful, we are in sync with repository now
> > --- 399,405 ----
> >                  ;; We also used to match the filename in column 0 without any
> >                  ;; meta-info before it, but I believe this can never happen.
> >                  (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)?  \\)"
> > !                        (regexp-quote (file-relative-name file)))
> 
> Is that backward compatible with older svn versions?

Further confirmed it works with the following versions:

svn, version 1.6.18 (r1303927)
svn, version 1.5.9 (r1041577)
svn, version 1.4.6 (r28521)
svn, version 1.3.2 (r19776)
svn, version 1.2.3 (r15833)

-- 
Tetsurou

Previous Next

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