From owner-freebsd-cvsweb Fri Jan 31 7: 6:18 2003 Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A3FE37B401 for ; Fri, 31 Jan 2003 07:06:16 -0800 (PST) Received: from fapdns01.systor.com (fapdns01.systor.com [193.192.230.116]) by mx1.FreeBSD.org (Postfix) with SMTP id 23AD443F3F for ; Fri, 31 Jan 2003 07:06:15 -0800 (PST) (envelope-from peter.klausner@systor.com) Received: (qmail 14132 invoked from network); 31 Jan 2003 14:55:32 -0000 Received: from unknown (HELO henderson.systor.com) (172.17.247.196) by fapdns01.systor.com with SMTP; 31 Jan 2003 14:55:32 -0000 To: freebsd-cvsweb@FreeBSD.org From: "Peter Klausner" Subject: Re: Patch for vendor branch tags MIME-Version: 1.0 Date: Fri, 31 Jan 2003 16:06:08 +0100 Message-ID: X-MIMETrack: Serialize by Router on HENDERSON/SYSTOR(Release 5.0.11 |July 24, 2002) at 31.01.2003 16:06:08 Content-type: text/plain; charset=us-ascii Sender: owner-freebsd-cvsweb@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG >A walkthrough of getting into the situation that this should fix would >be very welcome (a typescript or something, or a tarball of an affected >dir from a repository (not a working copy)). > Below follows a test script. -----8<----- #!/bin/sh P=branchtest rm -rf $CVSROOT/$P mkdir /tmp/$P || rm /tmp/$P/* cd /tmp/$P echo normal vendor branch >a cvs import -m r11 $P vendor1 release11 echo second vendor >> a echo second vendor > b cvs import -b1.1.2 -m r21 $P vendor2 release21 echo more changes >> a cvs import -b1.1.2 -m r22 $P vendor2 release22 ----->8----- It creates: * vendor1 at default vendor branch 1.1.1, file a * vendor2 at vendor branch 1.1.2, files a, b * release11 ..21 ..22 If you check the log of individual files, you see all revisions from all branches in normal chronological order. If you browse the dir with cvsweb.cgi, you will see only files in the lowest vendor branch, regardless of date, i.e. sort by date is misleading. If you select a specific vendor branch, you will see no files at all, it says: NOTE: There are 2 files, but none matches the current tag (vendor2). Here is a newer diff which fixes this for 1.137: ----8<---- *** cvsweb.cgi 2002/12/20 15:32:56 1.3 --- cvsweb.cgi 2003/01/30 15:22:15 *************** *** 2169,2175 **** "Branchpoint: $branchpoint\n" if ($verbose); ! if ($revwanted eq '' && $branch ne '' && $branch eq $revbranch || !defined($tag)) { print "File revision $rev found for branch $branch\n" --- 2169,2176 ---- "Branchpoint: $branchpoint\n" if ($verbose); ! if (($revwanted eq '' || $revwanted =~ /^1\.1\.\d+$/) ! && $branch ne '' && $branch eq $revbranch || !defined($tag)) { print "File revision $rev found for branch $branch\n" ---->8---- HTH + Bye, Peter Klausner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-cvsweb" in the body of the message