From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22442 invoked from network); 3 May 2000 16:24:08 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 3 May 2000 16:24:08 -0000 Received: (qmail 16903 invoked by alias); 3 May 2000 16:24:00 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 11129 Received: (qmail 16874 invoked from network); 3 May 2000 16:23:58 -0000 From: "Bart Schaefer" Message-Id: <1000503162336.ZM21917@candle.brasslantern.com> Date: Wed, 3 May 2000 16:23:36 +0000 In-Reply-To: <39100EE4.8EE393ED@u.genie.co.uk> Comments: In reply to Oliver Kiddle "Re: Completion system directories" (May 3, 12:35pm) References: <200005030914.LAA24343@beta.informatik.hu-berlin.de> <1000503103025.ZM21416@candle.brasslantern.com> <39100EE4.8EE393ED@u.genie.co.uk> X-Mailer: Z-Mail (5.0.0 30July97) To: Oliver Kiddle , zsh-workers@sunsite.auc.dk Subject: CVS merge conflicts (Re: Completion system directories) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii On May 3, 12:35pm, Oliver Kiddle wrote: } } While we're on the subject of cvs can people be a little careful with } the ChangeLog - I've fixed it a couple of times when the merge has gone } wrong. For an example, do: } cvs diff -r 1.183 -r 1.184 ChangeLog } An update before a commit might make it less likely? I always do update before I commit. One *can't* commit without first updating, in fact. An update before editing the ChangeLog would help if not for race conditions; in the case of r1.184 I'd already done an update, edited the file, and then attempted to commit, only to have it fail because your commit had gone in in the meantime. The 20 minutes between r1.183 and r1.184 were me attempting (apparently unsuccessfully) to fix the merge conflicts that resulted from my subsequent update. The real problem is that the diff algorithm is very bad at handling a series of short paragraphs separated by blank lines, because it considers the overlap in the two versions to end at a matching line, even if the matching lines are both empty. -- Bart Schaefer Brass Lantern Enterprises http://www.well.com/user/barts http://www.brasslantern.com