Akode and ffmpeg

Randy McMurchy randy at linuxfromscratch.org
Wed May 14 20:56:11 PDT 2008


Dan Nicholson wrote these words on 05/14/08 22:49 CST:

> You can either have another shallow checkout of
> svn://.../BLFS/branches/6.3, or just one huge checkout of
> svn://.../BLFS that has all the branches, tags and trunk. Applying
> individual commits in svn is sortof a PITA, but here's a little
> workflow that works for me:
> 
> # trunk is in blfs, 6.3 is in blfs-6.3
> $ cd blfs-6.3
> # find the commit I want from trunk
> $ svn log --limit 10 ../blfs
> # apply the commit
> $ svn merge -c <revnum> ../blfs
> # or just print out the diff to a file and apply it as a patch
> $ svn diff -c <revnum> ../blfs > t.diff
> $ patch -p1 -i t.diff

Or, just copy the file from trunk into your 6.3 branch checkout
(note that stuff in trunk that is going to the 6.3 branch won't
have a changelog entry), update the changelog and general.ent
(if required) and commit.

Dan's method is good, if there's lots of changes. If just one
file (kde-multimedia, for example), it's easier to just copy
the file from trunk to the branch and commit.

To each his own, I suppose.

-- 
Randy

rmlscsi: [bogomips 1003.22] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3]
[GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686]
22:51:00 up 87 days, 13:39, 1 user, load average: 0.26, 0.09, 0.05



More information about the blfs-dev mailing list