From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18565 invoked from network); 15 Jun 2000 09:04:39 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 15 Jun 2000 09:04:39 -0000 Received: (qmail 19965 invoked by alias); 15 Jun 2000 09:04:34 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 11916 Received: (qmail 19958 invoked from network); 15 Jun 2000 09:04:34 -0000 Date: Thu, 15 Jun 2000 10:04:05 +0100 From: Peter Stephenson Subject: Re: ChangeLog is just too big In-reply-to: "Your message of Thu, 15 Jun 2000 08:44:49 -0000." <1000615084449.ZM935@candle.brasslantern.com> To: zsh-workers@sunsite.auc.dk (Zsh hackers list) Message-id: <0FW600CA7UIS0U@la-la.cambridgesiliconradio.com> Content-transfer-encoding: 7BIT > I can't "cvs update" from SourceForge if there are merge conflicts on the > ChangeLog file. It just hangs forever. I finally had to move my modified > ChangeLog out of the way, copy in the unmodified one I use for generating > diffs (so that I don't have to hit sourceforge for that), and then update. > > I wish I had a good suggestion for what to do about this. I'll move the ChangeLog up to 3.1.9 to ChangeLog-Release and merge the two together at the next release --- from which point on the complete file will probably be renamed ChangeLog.4.0 and left, like ChangeLog.3.0. -- Peter Stephenson Cambridge Silicon Radio, Unit 300, Science Park, Milton Road, Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070