[dev] [commits] Horde branch develop updated. ff1c0a8415a974362929fea07a12e54be1d50737

[Jan Schneider]

Zitat von Michael M Slusarz <slusarz at horde.org>:

> Quoting Jan Schneider <jan at horde.org>:
>
>> Zitat von Michael M Slusarz <slusarz at horde.org>:
>>
>>> commit ff1c0a8415a974362929fea07a12e54be1d50737
>>> Author: Michael M Slusarz <slusarz at horde.org>
>>> Date:   Mon Jun 25 15:27:57 2012 -0600
>>>
>>>   Revert "Fix botched merges."
>>>
>>>   This reverts commit 9611207f3688474bea6648a109d53ad22195e687.
>>>
>>>   Conflicts:
>>>   	imp/package.xml
>>>   	ingo/package.xml
>>>
>>>   These are not botched merges.  Per discussion on dev@ a while back, we
>>>   made the decision to specifically not add any changelog information to
>>>   package.xml since it causes a guaranteed merge conflict (another reason
>>>   that merging from master -> develop doesn't make sense).
>>>
>>>   This is why the --nopackage option to horde-components was added.
>>
>> I don't agree, obviously. Not merging the changelogs somehow made  
>> sense, as long as those were there only differences between the  
>> package.xml files in master and develop. But at this point we 1)  
>> will have merge conflicts most of the time anyway, and 2) we rarely  
>> have changes in master.
>
> For the record, this was your decision :)
>
> http://marc.info/?l=horde-dev&m=132760405332003&w=2

Yes, I know, and it made perfectly sense at that time. :)

-- 
Jan Schneider
The Horde Project
http://www.horde.org/