ATTN devs: common `19.x-dev` branch renamed to `19.x`

[JedMeister]

Note to @OnGle @marcos-mendez - and other devs working on v19.x

---

I have just renamed the common 19.x-dev branch to 19.x so devs working on v19.x will need to update the branch you use. This will do the trick:

git fetch --all --prune
git checkout 19.x

Once you've done that, your local 19.x-dev branch can safely be deleted. Although using the lower case -d switch is recommended because the deletion to fail if there are additional commits locally (-D forces deletion - so don't do that unless you are sure):

git branch -d 19.x-dev

Because it's a branch rename, the commit history is identical so any existing dev branches you have that are based on 19.x-dev will not need to be rebased.

---

Tagged as a bug because it may be a disruption to developers. FWIW next major version update development round I will not use the '-dev' suffix so we can avoid this next time... Just leaving the previous major release branch as default is enough to note that it's a dev branch IMO...

[OnGle]

@JedMeister which repo does this relate too?

[JedMeister]

@JedMeister which repo does this relate too?

Oops sorry, this relates to common - I'll edit the top post.

[OnGle]

For some reason this didn't work for me. git fetch failed with fatal: couldn't find remote ref refs/heads/19.x-dev, I tried renaming my local branch, resetting tracking, pruning, removing and re-adding the remote. In the end the only way I could get it working was to just nuke my local common and re-clone.

Presumably something was still configured against the 19.x-dev that the above commands didn't fix.

[JedMeister]

Hmm, strange. FWIW I did test it on a local computer, but I guess there must have been something specific to my setup. I'll have a quick look on anther server...

[JedMeister]

FWIW I just tested on another TKLDev I had running and I couldn't reproduce the error - although there were a few specifics which may have affected the result:

• I didn't have the 19.x-dev branch checked out when I did the fetch
• I also used the --prune switch may have been a factor? (I also used --verbose but that wouldn't make any difference)
• My local repo was out of date... FWIW:

root@tkldev .../fab/common# git fetch --all --verbose --prune
Fetching turnkey
From github.com:turnkeylinux/common
 - [deleted]         (none)     -> turnkey/19.x-dev
 - [deleted]         (none)     -> turnkey/revert-312-18.x-arm64
remote: Enumerating objects: 573, done.
remote: Counting objects: 100% (105/105), done.
remote: Compressing objects: 100% (36/36), done.
remote: Total 573 (delta 88), reused 69 (delta 69), pack-reused 468 (from 2)
Receiving objects: 100% (573/573), 103.80 KiB | 267.00 KiB/s, done.
Resolving deltas: 100% (281/281), completed with 17 local objects.
 = [up to date]      15.x       -> turnkey/15.x
 = [up to date]      16.x       -> turnkey/16.x
 = [up to date]      17.x       -> turnkey/17.x
 = [up to date]      18.x       -> turnkey/18.x
 * [new branch]      19.x       -> turnkey/19.x
   9cf53c3..61ffbbf  master     -> turnkey/master
 = [up to date]      11.3       -> 11.3
 = [up to date]      12.0       -> 12.0
 = [up to date]      12.1       -> 12.1
 = [up to date]      13.0       -> 13.0
 = [up to date]      14.0       -> 14.0
 = [up to date]      14.1       -> 14.1
 = [up to date]      14.2       -> 14.2
 = [up to date]      15.x       -> 15.x
 = [up to date]      16.x       -> 16.x
Fetching origin
From github.com:JedMeister/common
 - [deleted]         (none)     -> origin/18.x
 - [deleted]         (none)     -> origin/18.x-gitrc
 - [deleted]         (none)     -> origin/beta-build
 - [deleted]         (none)     -> origin/master
 - [deleted]         (none)     -> origin/use-turnkey-keys-pkg
remote: Enumerating objects: 72, done.
remote: Counting objects: 100% (39/39), done.
remote: Total 72 (delta 38), reused 38 (delta 38), pack-reused 33 (from 2)
Unpacking objects: 100% (72/72), 9.56 KiB | 123.00 KiB/s, done.
 = [up to date]      18.x-arm64            -> origin/18.x-arm64
 = [up to date]      18.x-gh_releases-old  -> origin/18.x-gh_releases-old
 = [up to date]      18.x-set-yarn-version -> origin/18.x-set-yarn-version
   e9132dd..aaaef3b  19.x-dev              -> origin/19.x-dev
 = [up to date]      asp-net-core          -> origin/asp-net-core
 = [up to date]      docker-support        -> origin/docker-support
 * [new branch]      marcos-idempotency    -> origin/marcos-idempotency
 * [new branch]      marcos-ipv6-etc       -> origin/marcos-ipv6-etc
 = [up to date]      pi                    -> origin/pi
 * [new branch]      refactoring-plans     -> origin/refactoring-plans
 = [up to date]      rpi                   -> origin/rpi
 = [up to date]      rpi-arm64             -> origin/rpi-arm64
 = [up to date]      rpi-armhf             -> origin/rpi-armhf
 = [up to date]      spelling              -> origin/spelling
 + 1004aea...663c10b turnkey-php-scripts   -> origin/turnkey-php-scripts  (forced update)
 = [up to date]      11.3                  -> 11.3
 = [up to date]      12.0                  -> 12.0
 = [up to date]      12.1                  -> 12.1
 = [up to date]      13.0                  -> 13.0
 = [up to date]      14.0                  -> 14.0
 = [up to date]      14.1                  -> 14.1
 = [up to date]      14.2                  -> 14.2
 = [up to date]      15.x                  -> 15.x
 = [up to date]      16.x                  -> 16.x

Then when I checked out 19.x-dev:

root@tkldev .../fab/common# git checkout 19.x-dev 
Switched to branch '19.x-dev'
Your branch is based on 'turnkey/19.x-dev', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)

[JedMeister]

@OnGle - I just had a little more of a poke around and I think it might have been the --prune switch that made it "just work"? I've updated the OP (even though I know it's not an issue for you anymore).