Hi Santiago, On Wed, Apr 17, 2024 at 01:40:21PM +0200, Santiago Vila wrote: > Nice feature indeed. To simplify the usr-merge patch, I've adopted > the -D change in debian/postinst *before* we apply the usr-merge patch.
Thank you. > Please take a look at branch "wip-202404-usrmerge" here: > > https://salsa.debian.org/sanvila/base-files-not-yet/-/tree/wip-202404-usrmerge?ref_type=heads > > (The repository name speaks for itself... I'm still not comfortable enough > with salsa, but I'd like to experiment and see how it goes). > > I've rebased the patch relative to version 13.1 which I have just uploaded. Yeah, looks reasonable. > If the rebase is ok, I'd like to make some minor editorial changes there as > well. I noticed your upload before your mail and already updated the integration branch: https://salsa.debian.org/helmutg/bootstrap-usrmerge-demo/-/blob/main/patches/base-files Please let me know when you did your editorial changes such that I can replace my patch with yours and retest. At this time, we're down to the 5 planned packages base-files, bash, dash, glibc and util-linux and could upload in principle, but we really want time64 to migrate first and it's not clear when that'll happen. I'm negotiating a transition slot. Helmut
