From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7832 invoked from network); 16 Sep 1999 15:46:38 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 16 Sep 1999 15:46:38 -0000 Received: (qmail 16407 invoked by alias); 16 Sep 1999 15:46:27 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 7868 Received: (qmail 16400 invoked from network); 16 Sep 1999 15:46:26 -0000 Date: Thu, 16 Sep 1999 16:46:22 +0100 From: Adam Spiers To: Zsh hackers list Subject: Re: CVS (slightly off-topic) Message-ID: <19990916164622.B17248@thelonious.new.ox.ac.uk> Reply-To: Adam Spiers Mail-Followup-To: Zsh hackers list References: <990907162927.ZM32134@candle.brasslantern.com> <199909080900.LAA08747@paris.ifh.de> <19990908114038.B20503@thelonious.new.ox.ac.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0pre2i In-Reply-To: <19990908114038.B20503@thelonious.new.ox.ac.uk> X-URL: http://www.new.ox.ac.uk/~adam/ X-OS: Linux 2.2.9 i686 Thanks to all who replied to my CVS questions. After much fighting with CVS, I've managed to set up a repository with all the necessary branches and tags, so this will hopefully make it much easier for me to contribute patches. I'm taking the approach of putting all official and pws releases in the standard vendor branch, and making my own changes and those from zsh-workers on the main branch. I'm planning to only /commit/ my changes on the main branch after I've saved a copy of the output of a `cvs diff' which can be sent to this list, rather than messing around with tags for before and after my own changes. For reference, in case anyone in the future who hasn't already is thinking of going down the CVS route, and is reading this thread, something to be wary of is that if you do more than one import onto a vendor branch, you have to check for any files present in the first import but not the second. Do a `find . -print | sort' in both directories, and then do a cvs remove -f `comm -23 filelist_a filelist_b` on the respective outputs. I also had one weird conflict error reported in Completion/User/_cvs when I imported 3.1.6-pws-4 which I had to deal with manually. No idea why. Right, enough noise; on with the patches! :-) Adam