In my guest to update rumpkernels to current netbsd sources I've hit the
following snag:
NetBSD tools now builds pax. So I moved it in listsrcdirs from "usr"
to "sys" and did a githubdate in my own testing for of src-netbsd.
However that removes "bin/pax" from "all-src".
I figure the approach to merge from multiple branches used in githubdate simply
does not work if stuff gets moved from a branch later in the "git merge"
arguments to one earlier. git's octopus merge apparently applies the last
change for "bin/pax", which is the deletion on user-src, to all-src.
(Whether it applies the addition from kernel-src is not apparant from
hubdate output. But I guess it would be a no-op anyway, because bin/pax
is already on "all-src".)
What is to be done? Simply scrap the updating of
{appstack,all,buildrump}-src and make hubdateonebranch update those
branches from several cvs exports?
Something like the following?
hubdateonebranch all-src sys posix usr
--chris
