From: Peter Stephenson <pws@cambridgesiliconradio.com>
To: zsh-workers@sunsite.auc.dk (Zsh hackers list)
Subject: Re: ChangeLog is just too big
Date: Thu, 15 Jun 2000 10:04:05 +0100 [thread overview]
Message-ID: <0FW600CA7UIS0U@la-la.cambridgesiliconradio.com> (raw)
In-Reply-To: "Your message of Thu, 15 Jun 2000 08:44:49 -0000." <1000615084449.ZM935@candle.brasslantern.com>
> 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 <pws@cambridgesiliconradio.com>
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070
next prev parent reply other threads:[~2000-06-15 9:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-06-15 8:44 Bart Schaefer
2000-06-15 9:04 ` Peter Stephenson [this message]
2000-06-15 9:21 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0FW600CA7UIS0U@la-la.cambridgesiliconradio.com \
--to=pws@cambridgesiliconradio.com \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).