Re: Merge of Luca and Ben's sysfs work for Radeon

On Thu, Sep 25, 2003 at 07:57:44PM -0700, Jon Smirl wrote:

The merged tree is a copy of everything in Linus' tree plus our fbdev work.
Just treat it like a normal kernel tree.

make proper
copy your config
make oldconfig
make

The tree contains all of:
test5
fbdev work
hundreds of patches in the Linus tree past test5

To make sure it is absolutely up to date with Linus, cd into it and:
bk pull bk://linux.bkbits.net/linux-2.5
This will pull the up to the minute changes from Linus' own tree into yours.

done, it finish correctly with:

Consistency check passed, resolve complete.

To see the diffs from test5 to present:
bk revtool and find last revision number, probably something like 1.1303.
bk export -tpatch -rv2.6.0-test2,1.1303 -h >../patch

There will be a lot of diffs, Linus is about ready to tag test6.

To look at a specific file:
bk revtool file-name

Now that you have a bk tree you don't have to wait for a tagged release. Just
pull the changes fron Linus' tree when you want to update.

Probably am doing something wrong because there are no
sane files, just s.*.{c,h} binaries in SCCS subdir so i
can't treat it normally:

solca@appsrv:~/devel/radeon$ ls drivers/video/aty/SCCS/
s.aty128fb.c    s.atyfb.h         s.mach64_ct.c      s.mach64_gx.c  s.radeon_base.c  s.radeon_i2c.c      s.radeon_pm.c
s.atyfb_base.c  s.mach64_accel.c  s.mach64_cursor.c  s.Makefile     s.radeonfb.h     s.radeon_monitor.c  s.xlinit.c

-solca



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf