[vlc-devel] [PATCH] Fix typo 'allows to do' -> 'allows doing'.

Benjamin Drung bdrung at ubuntu.com
Mon Jul 25 17:54:28 CEST 2011


Am Montag, den 25.07.2011, 18:45 +0300 schrieb Rémi Denis-Courmont:
> Le lundi 25 juillet 2011 18:18:27 Benjamin Drung, vous avez écrit :
> > Am Montag, den 25.07.2011, 18:16 +0300 schrieb Rémi Denis-Courmont:
> > > Le lundi 25 juillet 2011 14:51:33 Benjamin Drung, vous avez écrit :
> > > > Am Sonntag, den 24.07.2011, 23:24 +0200 schrieb Jean-Baptiste Kempf:
> > > > > Patch does not apply against master.
> > > > 
> > > > Strange, I created this patch against master and it applies cleanly
> > > > with -p1 against a fresh master checkout. Maybe something went wrong
> > > > with inlining the patch. This time the patch is attached.
> > > 
> > > Neither of the patches apply here.
> > 
> > What it the output of 'patch -p1 < patchfile'?
> 
> patching file modules/video_filter/atmo/README.txt
> Hunk #1 FAILED at 50.
> Hunk #2 FAILED at 94.
> 2 out of 2 hunks FAILED -- saving rejects to file 
> modules/video_filter/atmo/README.txt.rej

I found the reason: modules/video_filter/atmo/README.txt has Windows end
of lines.

-- 
Benjamin Drung
Debian & Ubuntu Developer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20110725/ecef7ce6/attachment.sig>


More information about the vlc-devel mailing list