GNU bug report logs - #12757
24.2.50; vc-svn-merge-news: Couldn't analyze svn update result

Previous Next

Full log

Message #8 received at 12757 <at> debbugs.gnu.org (full text, mbox):

From: Andreas Schwab <schwab <at> linux-m68k.org>
To: OKAZAKI Tetsurou <okazaki.tetsurou <at> gmail.com>
Cc: 12757 <at> debbugs.gnu.org
Subject: Re: bug#12757: 24.2.50;
	vc-svn-merge-news: Couldn't analyze svn update result
Date: Mon, 29 Oct 2012 09:43:50 +0100

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?

Andreas.

-- 
Andreas Schwab, schwab <at> linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Previous Next

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