Hi Z572,

Z572 <z572@z572.online> writes:

Liliana Marie Prikler <liliana.prik...@gmail.com> writes:

## Repository Update Path

For a complete list of repositories associated with the Guix project, see GCD 002 ‘Migrating repositories, issues, and patches to Codeberg’. Most repositories can rename their main branch with no issue (see also Cost of
Reverting below).

For Guix itself, we would decide on a **flag day** 14 days after acceptance of this GCD at the earliest, and 30 days at the latest.
On that day, the main development branch would become "main".
A commit would reflect that by updating:

  1. the `branch` field in `.guix-channel`;
2. the `branch` field of `%default-guix-channel` in `(guix channels)`; 3. any other reference to the "master" branch of the Guix repository that may appear in the repository (in particular the Manual Updates
     above).


My main concern is whether it will affect guix time-machine.
Will the master branch be removed after the migration to the main
branch on some time, or will it just stay there?

Good question.

The proposal calls for keeping the master branch for a period of time following the switch, which is important to prevent Guix users who update infrequently from getting stuck. I think it should eventually get removed, but it’s hard to know what time to do it. Personally, I think not less than one year feels like the right ballpark.

I don’t think removing the master branch would break most uses of `guix time-machine', because this defaults to the system’s current channels, and the new branch will have the same commit IDs. It shouldn’t matter whether those commits happened before or after the rename.

The one case that could present problems is if `guix time-machine -C channels.scm' is called after the master branch has been removed, and channels.scm has the old branch name. This feels like an edge case to me, but if there’s strong evidence or consensus that this is imporant to maintain, the solution would be to keep the master branch around longer.

Please let me know if I’m missing someting.

Thanks,
 -- Ian

Reply via email to