Date: Mon, 03 Jun 2024 16:16:39 +0000 From: bugzilla-noreply@freebsd.org To: doc@FreeBSD.org Subject: [Bug 279503] Committer's Guide use the outdated stable/12 branch as examples Message-ID: <bug-279503-9@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
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.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-279503-9>