zsh-workers
 help / color / mirror / code / Atom feed
* ChangeLog was messed up at some point
@ 2000-07-20 15:55 Bart Schaefer
  2000-07-20 16:00 ` Chmouel Boudjnah
  0 siblings, 1 reply; 2+ messages in thread
From: Bart Schaefer @ 2000-07-20 15:55 UTC (permalink / raw)
  To: zsh-workers

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.

-- 
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] 2+ messages in thread

* Re: ChangeLog was messed up at some point
  2000-07-20 15:55 ChangeLog was messed up at some point Bart Schaefer
@ 2000-07-20 16:00 ` Chmouel Boudjnah
  0 siblings, 0 replies; 2+ messages in thread
From: Chmouel Boudjnah @ 2000-07-20 16:00 UTC (permalink / raw)
  To: zsh-workers

"Bart Schaefer" <schaefer@candle.brasslantern.com> 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2000-07-20 16:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-07-20 15:55 ChangeLog was messed up at some point Bart Schaefer
2000-07-20 16:00 ` Chmouel Boudjnah

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).