From: OKAZAKI Tetsurou <okazaki.tetsurou@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: 12757@debbugs.gnu.org, OKAZAKI Tetsurou <okazaki.tetsurou@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 [thread overview]
Message-ID: <lyd2zvhjv2.wl%%d8760cbe9be111513a996f4ad4c4b564ce8d2eef4e454003cc86bfed3017ae87@gmail.com> (raw)
In-Reply-To: <m2d3011xdl.fsf@igel.home>
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
next prev parent reply other threads:[~2012-11-02 19:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 2:43 bug#12757: 24.2.50; vc-svn-merge-news: Couldn't analyze svn update result OKAZAKI Tetsurou
2012-10-29 8:43 ` Andreas Schwab
2012-11-02 19:42 ` OKAZAKI Tetsurou [this message]
2012-11-17 7:07 ` Chong Yidong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=lyd2zvhjv2.wl%%d8760cbe9be111513a996f4ad4c4b564ce8d2eef4e454003cc86bfed3017ae87@gmail.com \
--to=okazaki.tetsurou@gmail.com \
--cc=12757@debbugs.gnu.org \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.