Re: Best Practice To Track Linux Kernel Changes

Lukas Ruf wrote:

>One (next) issue I do not know how to handle with subversion is:
>- I am working on several extensions to the Linux kernel of which I
> managed the source codes to keep running with latest 2.4 and 2.6 kernels.
>- However, I need to stay up-to-date with the kernel core-development,
> i.e. whenever a new kernel is released, I must important that kernel
> into the repository and apply all the patches.
>
>
I've been though something similar to this with subversion so I can
describe how I work it. I use svn_load_dirs. My layout is this:

$SVNURL/trunk/myproj
       /branches/myproj/merge-2004-02-28
                        merge-2004-03-31
                        ...
       /vendor/upstream/current
                       /2004-03-31
                       /2004-02-28
                       ...

The upstream tree is 'upstream'. 'myproj' is a version of 'upstream'
with local modifications. Let's say the last merge was 2004-03-31 and I
just got a new drop today:

LAST_MERGE=2004-03-31
NEW_DROP=2004-04-04
TRUNK_WC=path/to/wc/trunk/myproj
MERGE_WC=path/to/temp/wc/for/merge
DROP=path/to/new/drop

First I do svn_load_dirs

     svn_load_dirs -t $NEW_DROP $SVNURL/vendor/upstream current $DROP

Then I branch

     svn cp "$SVNURL/trunk/myproj" "$SVNURL/branches/myproj/merge-$NEW_DROP"

Then I merge

     svn co "$SVNURL/branches/myproj/merge-$NEW_DROP" $MERGE_WC
     cd $MERGE_WC
     svn merge "$SVNURL/vendor/upstream/$LAST_MERGE"
"$SVNURL/vendor/upstream/current"

After I test and fix problems/conflicts I commit changes and merge back
with trunk:

     svn commit
     cd $TRUNK_WC
     svn merge "$SVNURL/trunk/myproj"
"$SVNURL/branches/myproj/merge-$NEW_DROP"
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 4 19:29:36 2004