[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: |
OKAZAKI Tetsurou |
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 |
User-agent: |
Wanderlust/2.15.9 (Almost Unreal) Emacs/22.1 Mule/5.0 (SAKAKI) |
At Mon, 29 Oct 2012 09:43:50 +0100,
Andreas Schwab wrote:
>
> 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?
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
- bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update result,
OKAZAKI Tetsurou <=