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

[Chuck Hagenbuch]

Quoting Jan Schneider <jan at horde.org>:

> We don't lose them. They are still in the FRAMEWORK_3 branch

Okay, I see.

> that's where the changes done since DIMP 1.0-RC1 have been done.

Except they were also done in HEAD - meaning they happened in HEAD.

> There are no changes for 2.0-cvs yet. We could either track 1.0-cvs  
> changes in both branches, or only in the FW3 branch, and copy them  
> to 2.0-cvs each time we have a release from the FW3 branch.

What we've done in the past is to keep the changes in both branches  
(if they're made in both branches) - if you do a fix in HEAD and merge  
it to FW_3, where FW_3 is on version 1.0.1-cvs, you track it in HEAD's  
CHANGES file as a change for version 1.0.1. That way HEAD still has  
the full list of changes, and we have a place that has the full history.

-chuck