* ChangeLog is just too big
@ 2000-06-15 8:44 Bart Schaefer
2000-06-15 9:04 ` Peter Stephenson
0 siblings, 1 reply; 3+ messages in thread
From: Bart Schaefer @ 2000-06-15 8:44 UTC (permalink / raw)
To: zsh-workers
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.
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ChangeLog is just too big
2000-06-15 8:44 ChangeLog is just too big Bart Schaefer
@ 2000-06-15 9:04 ` Peter Stephenson
2000-06-15 9:21 ` Bart Schaefer
0 siblings, 1 reply; 3+ messages in thread
From: Peter Stephenson @ 2000-06-15 9:04 UTC (permalink / raw)
To: Zsh hackers list
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2000-06-15 9:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-06-15 8:44 ChangeLog is just too big Bart Schaefer
2000-06-15 9:04 ` Peter Stephenson
2000-06-15 9:21 ` Bart Schaefer
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).