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

[Jan Schneider]

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

> The branch "develop" has been updated.
> The following is a summary of the commits.
>
> from: e95e0ff02440dc17c62f87ce59a652180aea10ff
>
> ff1c0a8 Revert "Fix botched merges."
>
> -----------------------------------------------------------------------
>
> 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.

Adding changelogs before the release is tedious and easy to forget.  
And fixing merge conflicts in the changelog is rather easy now,  
because you only have to delete the master logs completely and are  
done. We are soon going to start with releases, so it's only a matter  
of days until we have to add the changes anyway.

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