I'm looking for the best way to mix newer files with
my 3-1 source tag.  For example, I like the new
features for date.1 which have been added recently
while keeping the rest of my src at 3-1, where
possible.

These commands get me the new date patches, and some
other files related to the change.

cd /usr/src
cvs -q upd -dP  -r netbsd-3-1 .
cd /usr/src/bin/date
cvs -q upd -dP -D 'Sun Nov 26 16:40:44 2006 UTC' .
cd /usr/src/lib/libutil
cvs -q upd -dP -D 'Sun Nov 26 16:40:44 2006 UTC' parsedate.3 parsedate.y

But when I do ./build.sh -U distribution I get the
errors below.  Presumably because I don't have the
correct /usr/src/lib/libutil/makefile and maybe some
other problems. Can I get this new date command
while staying in netbsd-3-1?

If I do:

cd /usr/src && cvs -q upd -dP -D 'Sun Nov 26 16:40:44 2006 UTC' .

I'll be missing 3-1 security updates and if I use
HEAD, I could have other problems.

Second part of my question, how do I manage a src
tree with a bunch of different tags or dates in
it? Do I need to write/maintain a script that does a
3-1 checkout of everything then decends to the odd
revisions and does an update for each of those dirs?
is there a more developed method?

// George


dependall ===> bin/date
#    create  date/date.d
CC=/usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/x86_64--netbsd-gcc /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/nbmkdep -f date.d -
-      -I/usr/src/bin/date  -nostdinc -isystem /usr/src/obj/destdir.amd64/usr/include   /usr/src/bin/date/date.c
#    create  date/netdate.d
CC=/usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/x86_64--netbsd-gcc /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/nbmkdep -f netdate.
d --      -I/usr/src/bin/date  -nostdinc -isystem /usr/src/obj/destdir.amd64/usr/include   /usr/src/bin/date/netdate.c
#    create  date/.depend
rm -f .depend
CC=/usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/x86_64--netbsd-gcc /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/nbmkdep -d -f .depe
nd -s .o\ .ln date.d netdate.d
rm -f .gdbinit
echo "set solib-absolute-prefix /usr/src/obj/destdir.amd64" > .gdbinit
#   compile  date/date.o
/usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/x86_64--netbsd-gcc -O2  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-
sign-compare -Wno-traditional -Wno-uninitialized -Wreturn-type -Wswitch -Wshadow  -Werror   -I/usr/src/bin/date  -nostdinc -isystem /usr/src/ob
j/destdir.amd64/usr/include  -c    /usr/src/bin/date/date.c
/usr/src/bin/date/date.c: In function `main':
/usr/src/bin/date/date.c:94: warning: implicit declaration of function `parsedate'

*** Failed target:  date.o
*** Failed command: /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/x86_64--netbsd-gcc -O2 -Wall -Wstrict-prototypes -Wmissing-prototypes -W
pointer-arith -Wno-sign-compare -Wno-traditional -Wno-uninitialized -Wreturn-type -Wswitch -Wshadow -Werror -I/usr/src/bin/date -nostdinc -isys
tem /usr/src/obj/destdir.amd64/usr/include -c /usr/src/bin/date/date.c
*** Error code 1

Stop.
nbmake: stopped in /usr/src/bin/date

*** Failed target:  dependall
*** Failed command: cd /usr/src/bin/date; /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/nbmake realall
*** Error code 1

Stop.
nbmake: stopped in /usr/src/bin/date

*** Failed target:  dependall-date
*** Failed command: _makedirtarget() { dir="$1"; shift; target="$1"; shift; case "${dir}" in /*) this="${dir}/"; real="${dir}" ;; .) this="bin/"; real="/usr/src/bin" ;; *) this="bin/${dir}/"; real="/usr/src/bin/${dir}" ;; esac; show=${this:-.}; echo "${target} ===> ${show%/}${1:+ (with: $@)}"; cd "${real}" && /usr/src/obj/tooldir.NetBSD-3.1.0_PATCH-x86_64/bin/nbmake _THISDIR_="${this}" "$@" ${target}; }; _makedirtarget date dependall
*** Error code 1

Stop.



-- 
George Georgalis, systems architect, administrator <IXOYE><