From nobody Mon Jun 3 16:16:39 2024 X-Original-To: doc@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VtJkv5KnLz5Mmwx for ; Mon, 03 Jun 2024 16:16:39 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VtJkv2xVxz43wc for ; Mon, 3 Jun 2024 16:16:39 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717431399; a=rsa-sha256; cv=none; b=M+Aqg7bs2r6Vk4Zna4Kq8u5zvl3QIhpIXbq9zDX2GXfOPq9jEQ2IE9snacEs1hO+ZJgty5 HYbkW239FCv7FmOzKvgLzyVKOsvXfzE1uDEmGwM3UTslbHlnkheDtuLHVgxL1xAI/onSKt h748g/TPyEDErChC8RcqfICaki1Omos1Jj6UzcbsgYCmWKIlei53hFEa7vbp9QmE7n0Tnf JZRhVXJJSzFdeW3u8O5H37f9WaJp+8JSTydRygPpgjg9CyT/9VEUwpnZKcBBvtBm8ouqwm uzdVNKvocKzmZV+INUPbk+kmCH97UiGht2gShQJmxVcYI4E+wm4zjLNa7jF+bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717431399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ruNrxC1AGmc6yIDHLVl8Tsu3xcYLi2vFcWugiMaoxlA=; b=rvoVcLGyq//HSDliK2oHGG9DtPDKEq9xLqNU9ynpfKl+URx4pEzuNuSc37455U6wOzNDHS ETsX+ANFpdFvvvv+9WLb4r/G5vXX/L9FtPV+/OD5biLhdpGL4xJEV5xdUkPit7Fib+z/rQ xd6LNlQLtL1T8vuAyCcVL+arPhCYhlQdfTkC0HQBM2UX2tlHQVAuOBtoGjdTQzkGv/yvas ml3Y1hPAUVGmObnZWpNfXFmItDa6ZN4nVediZtB9dpTmkfKjqOxFcViDyTtL1YjAQCobTF PQ0oaT3XGMkX15QAWmvQbHW1m6a2UgwjaO0YEb9rjpcD6kaOVQBFPwtMoBV1QQ== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VtJkv2YM1zhBW for ; Mon, 3 Jun 2024 16:16:39 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 453GGdAk016968 for ; Mon, 3 Jun 2024 16:16:39 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 453GGdVb016967 for doc@FreeBSD.org; Mon, 3 Jun 2024 16:16:39 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 279503] Committer's Guide use the outdated stable/12 branch as examples Date: Mon, 03 Jun 2024 16:16:39 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Documentation X-Bugzilla-Component: Books & Articles X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: wosch@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: doc@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Documentation project List-Archive: https://lists.freebsd.org/archives/freebsd-doc List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-doc@FreeBSD.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D279503 Bug ID: 279503 Summary: Committer's Guide use the outdated stable/12 branch as examples Product: Documentation Version: Latest Hardware: Any OS: Any Status: New Severity: Affects Some People Priority: --- Component: Books & Articles Assignee: doc@FreeBSD.org Reporter: wosch@FreeBSD.org The FreeBSD Committer's Guide use the outdated stable/12 branch as examples= . We should update to stable/14=20 cd doc/documentation/content/en/articles/committers-guide git grep stable-12 _index.adoc:% git checkout -b no-color-ls-stable-12 # create another name= for this branch _index.adoc:Then create a new name for it (no-color-ls-stable-12) in case y= ou need to get back to it. _index.adoc:% git worktree add ../freebsd-stable-12 stable/12 _index.adoc:this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory. _index.adoc:% cd ../freebsd-stable-12 _index.po:"% git checkout -b no-color-ls-stable-12 # create another name = for this branch\n" _index.po:"Then create a new name for it (no-color-ls-stable-12) in case you need to get back to it.\n" _index.po:msgid "% cd freebsd-current % git worktree add ../freebsd-stable-= 12 stable/12" _index.po:"this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory.\n" _index.po:"upstream now local and current tree updated % cd ../freebsd-stable-12 % git " git grep stable/12 _index.adoc:For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`. _index.adoc:If you wish to shift from stable/12 to the current branch. _index.adoc:If we pretend the example above was relative to stable/12, then= to move to `main`, I'd suggest the following: _index.adoc:% git rebase -i stable/12 no-color-ls --onto main _index.adoc:This will find all the commits to the current no-color-ls branch (back to where it meets up with the stable/12 branch) and then it will _index.adoc:% git reset --hard freebsd/stable/12 _index.adoc:% git worktree add ../freebsd-stable-12 stable/12 _index.adoc:this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory. _index.adoc:% git merge --ff-only freebsd/stable/12 _index.adoc:# now your stable/12 is up to date too _index.po:msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`." _index.po:"If you wish to shift from stable/12 to the current branch. If y= ou have a " _index.po:"If we pretend the example above was relative to stable/12, then = to move to `main`, I'd suggest the following:\n" _index.po:"% git rebase -i stable/12 no-color-ls --onto main\n" _index.po:"This will find all the commits to the current no-color-ls branch (back to where it meets up with the stable/12 branch) and then it will\n" _index.po:msgid "% git reset --hard freebsd/stable/12" _index.po:msgid "% cd freebsd-current % git worktree add ../freebsd-stable-= 12 stable/12" _index.po:"this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory.\n" _index.po:"merge --ff-only freebsd/stable/12 # now your stable/12 is up to = date too" --=20 You are receiving this mail because: You are the assignee for the bug.=