On Tue, May 01, 2018 at 04:12:42PM +0200, Marius Bakke wrote: > I was running a bit late with my patches and pushed them to a separate > branch before noticing the 'rhash' update on 'master'. Now there have > been a couple of world-rebuilding commits on the 'core-updates-next' > branch since, so I wonder how to move forward. > > * Start 'core-updates' as-is. > * Pick all updates from the -next branch that won't rebuild the world > (that is everything apart from "xz" and "file"). > * Take all the -next commits, remove the Perl graft, and do a new 'core' > evaluation. > > Any preferences? Due to the "rhash" update, I suppose we can take > anything from -next that depends on CMake also with option #1.
I haven't been paying attention this cycle. But if anyone has, then I think it's best to do option 1 along with the rhash, since most of the bug-fixing work will still be valid.
signature.asc
Description: PGP signature
