[dev] [cvs] commit: dimp/docs CHANGES

[Michael Rubinsky]

Quoting Chuck Hagenbuch <chuck at horde.org>:

> Quoting Jan Schneider <jan at horde.org>:
>
>> We've actually done both, because we often maintain three branches and
>> didn't track changes from the oldest branch in the HEAD's changelog.
>> But I'm fine with that.
>
> My recollection is that if something happened in HEAD, it was always
> in the HEAD changelog whether it was released from HEAD or not.
> Otherwise the HEAD changelogs wouldn't have the 3.1.x notes in them,
> right?
>
> If something happened *only* in a branch without being committed to
> HEAD and then merged then I agree putting it in the HEAD changelog
> doesn't make sense.
>
> I think we're getting closer to agreeing? :)

FWIW, I'd have to agree with Chuck. At least for the time that I've  
been making changelog entries, if it was a bugfix that was done in  
HEAD and merged to FW_3, I recall putting the entry in the HEAD log  
under the 3.1.x heading and also in the FW_3 log under the 3.1.x-cvs  
heading...and that seems to make the most sense (to me at least) :)


Thanks,
mike

--
The Horde Project (www.horde.org)
mrubinsk at horde.org

"Time just hates me. That's why it made me an adult." - Josh Joplin