From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8522 invoked from network); 20 Jul 2000 16:24:30 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 20 Jul 2000 16:24:30 -0000 Received: (qmail 9171 invoked by alias); 20 Jul 2000 16:24:20 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 12327 Received: (qmail 9164 invoked from network); 20 Jul 2000 16:24:19 -0000 X-Authentication-Warning: cassini.us.mandrakesoft.com: chmou set sender to chmouel@mandrakesoft.com using -f To: zsh-workers@sunsite.auc.dk Subject: Re: ChangeLog was messed up at some point References: <1000720155553.ZM2094@candle.brasslantern.com> From: Chmouel Boudjnah Date: 20 Jul 2000 09:00:32 -0700 In-Reply-To: "Bart Schaefer"'s message of "Thu, 20 Jul 2000 15:55:53 +0000" Message-ID: User-Agent: Gnus/5.0807 (Gnus v5.8.7) Emacs/20.6 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii "Bart Schaefer" writes: > I just did a "cvs update" and discovered that a merge conflict had been > improperly resolved at some point recently. This resulted in at least > duplication of a lot of ChangeLog entries; it may have caused lossage > that I wasn't able to detect. I fixed it up as best I was able and have > committed the result, but anyone who has made a change in the last few > days should look through to see if your log entries are missing. i have reorderer one entry to be by the date. -- MandrakeSoft Inc http://www.mandrakesoft.com San-Francisco, CA USA --Chmouel