summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2011-11-09 17:49:25 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2011-11-09 17:49:25 +0000
commit6ed7fab103836bb4fd716e90eef255630674fffe (patch)
tree1b38540bb2aea1177cb910d958a2cbe4b56c4de0
parent970adcc4d0e9f2ab08439d9db43076e02885553b (diff)
downloadzsh-6ed7fab103836bb4fd716e90eef255630674fffe.tar.gz
zsh-6ed7fab103836bb4fd716e90eef255630674fffe.tar.xz
zsh-6ed7fab103836bb4fd716e90eef255630674fffe.zip
Akinori MUSHA: 29900: Backends/VCS_INFO_detect_svn: Adjust detection to support subversion 1.7.
-rw-r--r--ChangeLog8
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_detect_svn4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e712811a5..70e82baa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-09  Frank Terbeck  <ft@bewatermyfriend.org>
+
+	* Akinori MUSHA: 29900:
+	Functions/VCS_Info/Backends/VCS_INFO_detect_svn: Adjust detection
+	to support subversion 1.7.
+
 2011-11-08  Peter Stephenson  <pws@csr.com>
 
 	* Haakon Riiser: 29895, 29887: Completion/Unix/Command/_ffmpeg,
@@ -15559,5 +15565,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5496 $
+* $Revision: 1.5497 $
 *****************************************************
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_svn b/Functions/VCS_Info/Backends/VCS_INFO_detect_svn
index a777ecc43..43dedcde9 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_svn
+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_svn
@@ -7,5 +7,5 @@ setopt localoptions NO_shwordsplit
 [[ $1 == '--flavours' ]] && return 1
 
 VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0
-return 1
+vcs_comm[detect_need_file]="entries format"
+VCS_INFO_bydir_detect '.svn' || return 1