From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15996 invoked by alias); 11 Feb 2011 06:56:47 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 28739 Received: (qmail 9916 invoked from network); 11 Feb 2011 06:56:45 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS autolearn=ham version=3.3.1 Received-SPF: none (ns1.primenet.com.au: domain at bewatermyfriend.org does not designate permitted sender hosts) From: Frank Terbeck To: zsh-workers@zsh.org Cc: lhw@ring0.de, 611175@bugs.debian.org, Phil Pennock Subject: PATCH: Fix for vcs_info's svn detection User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) Date: Fri, 11 Feb 2011 07:47:03 +0100 Message-ID: <8739nvgja0.fsf@ft.bewatermyfriend.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: 430444 Let's try this again, shall we? Apparently, it's harder to use an email client than it looks. Also, as Mikael informs me on IRC, I screwed up the patch in the first mail... *sigh* ...now that CVS is back... Here's a fix for an issue with vcs_info's subversion detection, which was reported in the debian BTS (issue #611175=C2=B9). The fix was suggested by Lennart Weller. =C2=B9 Regards, Frank Index: Functions/VCS_Info/Backends/VCS_INFO_detect_svn =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/zsh/zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_svn,v retrieving revision 1.2 diff -u -r1.2 VCS_INFO_detect_svn --- Functions/VCS_Info/Backends/VCS_INFO_detect_svn 11 Dec 2008 09:53:13 -0= 000 1.2 +++ Functions/VCS_Info/Backends/VCS_INFO_detect_svn 11 Feb 2011 06:44:51 -0= 000 @@ -7,5 +7,5 @@ [[ $1 =3D=3D '--flavours' ]] && return 1 =20 VCS_INFO_check_com ${vcs_comm[cmd]} || return 1 -[[ -d ".svn" ]] && return 0 +{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0 return 1