Email or username:

Password:

Forgot your password?
Simon Tournier

yhetil.org/guix/87le0cj13e.fsf

How do I know when #Guix has merged the ’core-updates’ branch bringing many package updates? 🤔 when I pause my current tasks and instead fix annoyances. 😀

Emacs: issues.guix.gnu.org/72333#12
Git: issues.guix.gnu.org/73034#1
Another example: @khinsen reported about compressed man-pages.

Since now core-updates is gone, the friction should decrease. 🎉

Still, it opens questions how to merge changes that trigger many rebuilds.

You’ve experience with “merge train”, please share it!

8 comments
d@nny "disc@" mc²

@zimoun @khinsen oh wow, i hadn't considered that guix would also handle emacs lisp packages like magit. that's really neat

Ludovic Courtès

@zimoun The tiny-teensy team that took care of ‘core-updates’ (myself included) did lots of testing, tons of fixing, and put out calls for testing and an advanced notice before the merge.

I think it’s the first time this branch is merged with so few problems detected afterwards.

The Emacs and Git issues are problematic; apparently they could only be detected through regular use, and perhaps individuals didn’t go that far when testing things on their machine before the merge.

@khinsen

Ludovic Courtès

@zimoun So I’m curious what suggestions people might have to avoid issues like the two you mentioned.

@khinsen

Simon Tournier

@civodul Far from me the idea to complain: what an tireless job by volunteers. Kudos! And for sure, joining the party’s free. :-)

As we know, core-updates merges always provides collateral annoyances. And this workflow scales poorly. Nothing new, IMHO.

The project’s moving to another workflow using more branches. Good thing, IMHO.

How to merge (=test) them? Nothing new – a variant of “Incentives for review”.

@khinsen

Konrad Hinsen

@zimoun I agree! If I run into such problems when I am too busy to deal with them, I just roll back and wait for a while.

Inversely, when I do have the spare time to beta-tests, I'd be happy to play guinea-pig for important updates before they get merged. I just have no idea how to find out when such testing is needed.

@civodul

Ludovic Courtès

@zimoun (Actually, the Emacs ‘transient.el’ issue predates the ‘core-updates’ merge.)
@khinsen

Simon Tournier

@civodul If you prefer, replace in my text "core-updates branch merge" with "when I run 'guix pull' and want to upgrade". ;-)

@khinsen

Konrad Hinsen

@zimoun Thanks for the info, I was about to debug the transient issue myself! 😃

Go Up