[CFT] merging projects/entities

[René Ladan]

On 07-07-2013 22:14, Gabor Kovesdan wrote:
> Em 07-07-2013 21:00, René Ladan escreveu:
>> Heh, missed that myself too. So now only tidying up or synchronizing
>> whitespace for share/xml/catalog.xml remains to be done?
> Personally, I think it would be better to commit that whitespace fix
> separately. Even if you committed it separately in the branch, it
> would go to head intermixed with real changes, which makes it hard to
> read the backlog. This is a disadvantage in general and it is quite a
> big hassle for translators. I think you did it fine since you didn't
> have to foresee these consequences but maybe we should document it as
> a best practice to avoid whitespace changes in branches.
>
I didn't think it through this far, but you're right. I think it's best
to write this down somewhere in the FDP?

For now this is fixed in head (r42191, whitespace-only forward commit)
and in
projects/entities (r42192, fix some inadvertent changes). The only
changes left are
those from r40196, which are intended (modulo inline whitespace :-( ).

René