HomePhabricator
Transition 'master' to 'devel'

I've just finished changing all of our repositories over to use devel as the primary development branch, instead of master.

To make your local copies use this new system, you need to run a few commands in each repository. I recommend doing this right now:

git checkout master
git branch -m master devel
git fetch
git branch --unset-upstream
git branch -u origin/devel
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/devel
mkdir -p .git/arc; echo origin/devel > .git/arc/default-relative-commit

Or, if you prefer that as a one-liner:

git checkout master; git branch -m master devel; git fetch; git branch --unset-upstream; git branch -u origin/devel; git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/devel; mkdir -p .git/arc; echo origin/devel > .git/arc/default-relative-commit

These commands come from an excellent article by Scott Hanselman about the master to main transition; I've just adapted it for our use.

Thank you!

Written by jcmcdonald on Jul 6 2020, 8:16 PM.
CEO, Lead Developer
Projects
None
Subscribers
ardunster, bdvolwiler, wangonya and 6 others

Event Timeline

The one-liner is very practical!

I added the following command to this to update Arcanist, so if you've already done the rest of these commands, be sure to go back and run the following in each repository:

mkdir -p .git/arc; echo origin/devel > .git/arc/default-relative-commit

Error message - no such file or directory: in diamondquest, iosqueak, libdeps, and pawlib.

@wdede Anywhere it complains, don't worry about it. That just means you haven't configured that yet.

I've updated the command slightly to account for that situation.