[dev] [commits] Horde branch mnemo_4_1 updated. 7324877f91d83f8de26d41ba7ca05be559255994

[Jan Schneider]

Zitat von "Michael J. Rubinsky" <mrubinsk at horde.org>:

> The branch "mnemo_4_1" has been updated.
> The following is a summary of the commits.
>
> from: 06823ed8f9c38538ca7cab30b6594cd87a5b6c4d
>
> 7324877 Remove 4.1 changelog
>
> -----------------------------------------------------------------------
>
> commit 7324877f91d83f8de26d41ba7ca05be559255994
> Author: Michael J Rubinsky <mrubinsk at horde.org>
> Date:   Thu Mar 21 13:26:49 2013 -0400
>
>     Remove 4.1 changelog
>
>  mnemo/package.xml |   13 -------------
>  1 files changed, 0 insertions(+), 13 deletions(-)
>
> http://git.horde.org/horde-git/-/commit/7324877f91d83f8de26d41ba7ca05be559255994

Er, no. If anywhere, it needs to be removed from the main changelog  
entry. The entries at the bottom merge just fine and are needed to  
rebuild the main entry once we merged back.
I still prefer to have the main entry in the branches filled with the  
correct changelog entries too, fixing conflict during merging is  
really not so much work, just repetitive.
-- 
Jan Schneider
The Horde Project
http://www.horde.org/