P POSIX.1 Yesterday at 1:23 PM #1 With the RELEASE you get zfs-2.4.0-rc4-FreeBSD. STABLE has 2.4.0-1. How to merge the zfs/zpool source from stable/15 with the releng/15.0? Purpose: Build an installation media for RELEASE-15.0 that installs zpools with version 2.4.0-1?
With the RELEASE you get zfs-2.4.0-rc4-FreeBSD. STABLE has 2.4.0-1. How to merge the zfs/zpool source from stable/15 with the releng/15.0? Purpose: Build an installation media for RELEASE-15.0 that installs zpools with version 2.4.0-1?
SirDice Administrator Staff member Administrator Moderator Yesterday at 1:47 PM #2 POSIX.1 said: How to merge the zfs/zpool source from stable/15 with the releng/15.0? Click to expand... You don't. Just wait for 15.1-RELEASE.
POSIX.1 said: How to merge the zfs/zpool source from stable/15 with the releng/15.0? Click to expand... You don't. Just wait for 15.1-RELEASE.
OP P POSIX.1 Yesterday at 1:52 PM Thread Starter #3 SirDice said: Just wait for 15.1-RELEASE. Click to expand... If that were an option, I'd not spent the time writing this here. I hoped on some advice on how to merge this locally with a proper git command.
SirDice said: Just wait for 15.1-RELEASE. Click to expand... If that were an option, I'd not spent the time writing this here. I hoped on some advice on how to merge this locally with a proper git command.
T T-Daemon Yesterday at 9:53 PM #4 POSIX.1 said: I hoped on some advice on how to merge this locally with a proper git command. Click to expand... Find the commit hash for OpenZFS 2.4.0 in the stable/15 branch and git-cherry-pick(1) the hash in releng/15.0. See Committer's Guide, 5.3. MFC (Merge From Current) Procedures for merging details.
POSIX.1 said: I hoped on some advice on how to merge this locally with a proper git command. Click to expand... Find the commit hash for OpenZFS 2.4.0 in the stable/15 branch and git-cherry-pick(1) the hash in releng/15.0. See Committer's Guide, 5.3. MFC (Merge From Current) Procedures for merging details.
OP P POSIX.1 Yesterday at 10:22 PM Thread Starter #5 T-Daemon thank you! The cherry-pick was the detail missing, as I'm not so deep into git. SirDice The advice to wait half a year is certainly valid for "kids don't do this @home ... ".
T-Daemon thank you! The cherry-pick was the detail missing, as I'm not so deep into git. SirDice The advice to wait half a year is certainly valid for "kids don't do this @home ... ".
