[FFmpeg-devel] [Fwd: Summer of code small task patch]

Stefano Sabatini stefano.sabatini-lala
Tue Mar 31 20:04:55 CEST 2009

On date Monday 2009-03-30 20:37:36 +0200, Dylan Yudaken encoded:
> Michael Niedermayer wrote:
>> On Mon, Mar 30, 2009 at 12:16:48AM +0200, Dylan Yudaken wrote:
>>> sorry - I am struggling to separate into 2 clear patches. I have 
>>> attached 1 patch, I think diego said he would split it up. I cant 
>>> find a way to do a local commit on svn so that I can diff between 
>>> different stages of my patch.
>> you can just make a second directory and diff between 2 files or directories
>> with diff -u
>> (there are other ways also like using git but git probably needs too much
>>  time to learn for this purpose now)
> didnt know there was a git. way easier - attached.

Or if you don't want/can't use git there is also quilt, which is a
bash based simple tool (with not all the whistles and bells as git)
which permits you to create a stack of patches.

Something like:
quilt new lame-change.patch
quilt add file.c
edit file.c
quilt refresh

quilt new cool-change.patch
quilt add file.c file.h
edit file.c
quilt refresh

Patches are created in the "patches" dir.

Then you can push/pop patches from your working copy doing quilt

FFmpeg = Fundamentalist and Foolish Majestic Philosophical Extensive Gargoyle

More information about the ffmpeg-devel mailing list