[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update resul
From: |
Andreas Schwab |
Subject: |
bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update result |
Date: |
Mon, 29 Oct 2012 09:43:50 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
OKAZAKI Tetsurou <okazaki.tetsurou@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@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."