[Ffmpeg-devel] [PATCH] BMP encoder (again!)

[Michel Bardiaux]

Diego Biurrun wrote:
> On Mon, Feb 05, 2007 at 04:18:55PM +0100, Michel Bardiaux wrote:
>> Diego Biurrun wrote:
>>> Committed with changelog entry.
>> Thanks.
>>
>> But now I've a slight problem:
>>
>> svn update
>> G  libavcodec/avcodec.h
>> svn: Failed to add file 'libavcodec/bmpenc.c': object of the same name 
>> already exists
>>
>> svn status
>> !      libavcodec
>> A      libavcodec/bmpenc.c
>>
>> What is the official remedy for such a situation?
> 
> (Re)move your bmpenc.c.  What else?
> 

Actually I had to do this:

cp bmpenc.c bmpenc.mine (cp, not mv!)
svn delete --force bmpenc.c
svn update
diff bmpenc.c bmpenc.mine (just to be sure)

-- 
Michel Bardiaux
R&D Director
T +32 [0] 2 790 29 41
F +32 [0] 2 790 29 02
E mailto:mbardiaux at mediaxim.be

Mediaxim NV/SA
Vorstlaan 191 Boulevard du Souverain
Brussel 1160 Bruxelles
http://www.mediaxim.com/