[FFmpeg-devel] libswscale/yuv2rgb_init.c license

[Benoit Fouet]

Luca Abeni wrote:
> Hi Diego,
>
> Luca Abeni wrote:
>   
>> Hi Diego,
>>
>> Diego Biurrun wrote:
>> [...]
>>     
>>>> I think the file is still in svn history, no? So, if needed it can be 
>>>> "resurrected", and the header can be fixed in the proper way.
>>>>         
>>> I think that would be the best solution so that nobody that resurrects
>>> the file in the future gets into the same troubles that you had.
>>>       
>> Ok, tomorrow I'll look at recovering the file from svn, putting a 
>> reasonable license header on it, and removing the updated version.
>>     
>
> Sorry for the delay; I've been preempted by some other things... Anyway, 
>   I am going to do this operation asap. Only a little question, before 
> doing something wrong with subversion ;-). Here is what I plan to do:
> 1) svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
> 2) cd ffmpeg/libswscale
> 3) svn cp -r 23714 
> svn://svn.mplayerhq.hu/mplayer/trunk/libswscale/yuv2rgb_init.c 
> yuv2rgb_init.c
> 4) edit yuv2rgb_init.c, adding the license header from yuv2rgb.c
> 5) svn commit yuv2rgb_init.c
> 6) svn rm yuv2rgb_init.c
> 7) svn commit
>
> Is this ok? Or should I add an "svn commit" between step 3) and 4)? Or 
> can I remove step 5)? I am asking to avoid doing the thing in the wrong 
> way, and having to play some other "svn games" to recover from my error...
>
>   

you cannot remove step 5
and the step 5 commit will appear as an svn copy modified, so i think
this is fine as far as the file history is concerned.

-- 
Ben
Purple Labs S.A.
www.purplelabs.com