[dev] [commits] Horde branch develop updated. 6f85868cca80c895880586bd45084ab7fa33e908

[Michael M Slusarz]

Quoting Jan Schneider <jan at horde.org>:

> Zitat von Michael M Slusarz <slusarz at horde.org>:
>
>> Quoting Jan Schneider <jan at horde.org>:
>>
>>> commit 4a1a8afbf637d8f28dc5de64826f21b94f5e7e78
>>> Author: Jan Schneider <jan at horde.org>
>>> Date:   Thu Jan 26 17:08:55 2012 +0100
>>>
>>>   We actually don't want to track the changes here (yet) because  
>>> it makes merging harder.
>>>
>>> imp/package.xml |   28 ++--------------------------
>>> 1 files changed, 2 insertions(+), 26 deletions(-)
>>>
>>> http://git.horde.org/horde-git/-/commit/4a1a8afbf637d8f28dc5de64826f21b94f5e7e78
>>
>> This prevents us from being able to use horde-components change, though.
>
> Yes, that's why re-added the changelog first. But then I figured  
> that you don't need horde-components anyway, if you only update  
> CHANGES. And resolving merge conflicts is much more annoying than  
> updating the changelog manually IMO.

I went ahead and added a '--nopackage' option to the change component  
handler to allow to continue to automatically add entries to CHANGES  
without breaking package.xml.

michael

___________________________________
Michael Slusarz [slusarz at horde.org]