Initial merge

[Johannes Sixt]

Am 2/4/2011 13:51, schrieb Andreas Pakulat:
> On 04.02.11 08:47:08, Johannes Sixt wrote:
>> Am 2/3/2011 13:04, schrieb Johannes Sixt:
>> The simplicity results from two assumptions:
>>
>> (1) All back- and forward-porting was complete when SVN went
>> read-only.
> 
> I'm not sure that assumption is safe.

If it is not, any violation of the assumption must be fixed after the
merge with cherry-picks. But the same would have had to happen if the
transition to git had not taken place (and then you would have named the
procedure "backporting"). So, in practice, it will not make a difference.

>> (2) *.desktop and similar files are "generated" files, i.e., their content
>> is dictated from outside the repository.
> 
> And that one is certainly not safe, unless you're solely talking about the
> translated parts in them. Not everything in a .desktop file is generated.

Let me be more precise: The assumption is that any change that happened to
these files since the transition to git is automatically generated, and
any manual change I would have made would be overwritten by Script Kiddy
on its next run.

Or lets state it in a completely different way: I assume that there are no
changes in *.desktop and similar files in any of the branches that need
forward-porting.

Hannes
-- 
"Atomic objects are neither active nor radioactive." --
Programming Languages -- C++, Final Committee Draft (Doc.N3092)