... been running a laptop that right now requires CURRENT... Looks like it (13.x) is almost on schedule...
Since stable/13 has been branched on 01/22/2021 a new drm-kmod port (package), graphics/drm-fbsd13-kmod, has been introduced, upgrading might go more smoothly.This means upgrading pkgs often messes things up.
Meanwhile, maybe you are interested, there is an FreeBSD-13.0-ALPHA2 image availaible, freebsd-update(8) should be working.I'll probably wait till an RC is released to change the laptop though.
git clone -b stable/13
, etc. egrep "^REVISION|^BRANCH" newvers.sh
REVISION="13.0"
BRANCH="ALPHA2"
I have a love-hate relationship with the Git stash. It can be awfully handy, but it can also cause confusion if you abuse it. Typically something like this happens. I'm working along, and I need to pull in some changes that someone else has committed. Let's look at a contrived example using the Freebsd source:I have no idea on git syntax, I always felt svn is way more user friendly thats why I asked on here. Thanks
$ git status
On branch releng/12.1
Your branch is up to date with 'origin/releng/12.1'.
nothing to commit, working tree clean
$ vi README
$ git pull
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
$ git stash
Saved working directory and index state WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
$ git stash list
stash@{0}: WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
$ git pull
remote: Enumerating objects: 5277, done.
remote: Counting objects: 100% (5277/5277), done.
remote: Compressing objects: 100% (86/86), done.
remote: Total 12398 (delta 5230), reused 5194 (delta 5191), pack-reused 7121
Receiving objects: 100% (12398/12398), 9.88 MiB | 12.83 MiB/s, done.
Resolving deltas: 100% (8989/8989), completed with 3679 local objects.
From https://git.freebsd.org/src
fb6bc290fb3..94ac312a716 main -> origin/main
...
$ git stash pop
On branch releng/12.1
Your branch is up to date with 'origin/releng/12.1'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: README
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (e6a9cef2a2a028c06ac996b885f6168c54110ced)
$ git stash list
$ git status
On branch releng/12.1
Your branch is up to date with 'origin/releng/12.1'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: README
no changes added to commit (use "git add" and/or "git commit -a")
$ git stash list
stash@{0}: WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
stash@{1}: WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
$ git stash pop
error: Your local changes to the following files would be overwritten by merge:
README
Please commit your changes or stash them before you merge.
Aborting
The stash entry is kept in case you need it again.
$ git stash list
stash@{0}: WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
stash@{1}: WIP on 12.1: e30782bbdad Fix OpenSSL NULL pointer de-reference.
git stash show -p
$ git stash show -p
diff --git a/README b/README
index aad363baf9e..7aa1dfb46c7 100644
--- a/README
+++ b/README
@@ -78,3 +78,4 @@ For information on synchronizing your source tree with one or more of
the FreeBSD Project's development branches, please see:
https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html
+bar
diff --git a/README.md b/README.md
index 72bd634cd81..939b885a59c 100644
--- a/README.md
+++ b/README.md
@@ -80,3 +80,4 @@ For information on synchronizing your source tree with one or more of
the FreeBSD Project's development branches, please see:
https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html
+foo
git stash apply
does not drop stash entries after it applies them like git stash pop
does.It’s not that easy. Subversion and Git have quite different paradigms, so you cannot translate all commands one-to-one.Look on the web for a SVN to git translation table.