git: 34bb438d3e - main - doc: Update source files (en .po), for translations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Oct 2022 13:20:34 UTC
The branch main has been updated by dbaio:
URL: https://cgit.FreeBSD.org/doc/commit/?id=34bb438d3e5f39fd0f84095a73e86bcef4a41071
commit 34bb438d3e5f39fd0f84095a73e86bcef4a41071
Author: Danilo G. Baio <dbaio@FreeBSD.org>
AuthorDate: 2022-10-01 13:14:16 +0000
Commit: Danilo G. Baio <dbaio@FreeBSD.org>
CommitDate: 2022-10-01 13:14:16 +0000
doc: Update source files (en .po), for translations
---
.../content/en/articles/committers-guide/_index.po | 2043 ++--
documentation/content/en/articles/releng/_index.po | 4 +-
.../en/books/porters-handbook/special/_index.po | 2694 ++---
.../en/books/porters-handbook/uses/_index.po | 518 +-
.../en/books/porters-handbook/versions/_index.po | 10698 ++++++++++---------
5 files changed, 8083 insertions(+), 7874 deletions(-)
diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po
index 74820ee070..81fb326abb 100644
--- a/documentation/content/en/articles/committers-guide/_index.po
+++ b/documentation/content/en/articles/committers-guide/_index.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: FreeBSD Documentation VERSION\n"
-"POT-Creation-Date: 2022-08-07 10:21-0300\n"
+"POT-Creation-Date: 2022-10-01 10:13-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1244,7 +1244,7 @@ msgstr ""
#. type: delimited block . 4
#: documentation/content/en/articles/committers-guide/_index.adoc:553
-#: documentation/content/en/articles/committers-guide/_index.adoc:2066
+#: documentation/content/en/articles/committers-guide/_index.adoc:2067
#, no-wrap
msgid ""
"If you want to create a new branch to retain commits you create, you may\n"
@@ -1253,7 +1253,7 @@ msgstr ""
#. type: delimited block . 4
#: documentation/content/en/articles/committers-guide/_index.adoc:555
-#: documentation/content/en/articles/committers-guide/_index.adoc:2068
+#: documentation/content/en/articles/committers-guide/_index.adoc:2069
#, no-wrap
msgid " git checkout -b <new-branch-name>\n"
msgstr ""
@@ -1687,17 +1687,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:776
+#: documentation/content/en/articles/committers-guide/_index.adoc:772
+msgid "====== Time to update"
+msgstr ""
+
+#. type: Plain text
+#: documentation/content/en/articles/committers-guide/_index.adoc:777
msgid ""
-"====== Time to update When it is time to bring in a new version, it is "
-"almost the same as w/o the branches. You would update like you would above, "
-"but there is one extra command before you update, and one after. The "
-"following assumes you are starting with an unmodified tree. It is important "
-"to start rebasing operations with a clean tree (Git requires this)."
+"When it is time to bring in a new version, it is almost the same as w/o the "
+"branches. You would update like you would above, but there is one extra "
+"command before you update, and one after. The following assumes you are "
+"starting with an unmodified tree. It is important to start rebasing "
+"operations with a clean tree (Git requires this)."
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:782
+#: documentation/content/en/articles/committers-guide/_index.adoc:783
#, no-wrap
msgid ""
"% git checkout main\n"
@@ -1706,7 +1711,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:787
+#: documentation/content/en/articles/committers-guide/_index.adoc:788
msgid ""
"This will bring up an editor that lists all the commits in it. For this "
"example, do not change it at all. This is typically what you are doing "
@@ -1715,14 +1720,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:789
+#: documentation/content/en/articles/committers-guide/_index.adoc:790
msgid ""
"Once you are done with the above, you have to move the commits to ls.c "
"forward from the old version of FreeBSD to the newer one."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:796
+#: documentation/content/en/articles/committers-guide/_index.adoc:797
msgid ""
"Sometimes there are merge conflicts. That is OK. Do not panic. Instead, "
"handle them the same as any other merge conflicts. To keep it simple, I "
@@ -1731,7 +1736,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:799
+#: documentation/content/en/articles/committers-guide/_index.adoc:800
msgid ""
"Let's say the includes changes upstream in a radical shift to terminfo as "
"well as a name change for the option. When you updated, you might see "
@@ -1739,7 +1744,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:809
+#: documentation/content/en/articles/committers-guide/_index.adoc:810
#, no-wrap
msgid ""
"Auto-merging bin/ls/ls.c\n"
@@ -1753,7 +1758,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:812
+#: documentation/content/en/articles/committers-guide/_index.adoc:813
msgid ""
"which looks scary. If you bring up an editor, you will see it is a typical "
"3-way merge conflict resolution that you may be familiar with from other "
@@ -1761,7 +1766,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:822
+#: documentation/content/en/articles/committers-guide/_index.adoc:823
#, no-wrap
msgid ""
"<<<<<<< HEAD\n"
@@ -1775,14 +1780,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:825
+#: documentation/content/en/articles/committers-guide/_index.adoc:826
msgid ""
"The new code is first, and your code is second. The right fix here is to "
"just add a #undef COLORLS_NEW before #ifdef and then delete the old changes:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:830
+#: documentation/content/en/articles/committers-guide/_index.adoc:831
#, no-wrap
msgid ""
"#undef COLORLS_NEW\n"
@@ -1791,12 +1796,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:833
+#: documentation/content/en/articles/committers-guide/_index.adoc:834
msgid "save the file. The rebase was interrupted, so you have to complete it:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:837
+#: documentation/content/en/articles/committers-guide/_index.adoc:838
#, no-wrap
msgid ""
"% git add ls.c\n"
@@ -1804,7 +1809,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:842
+#: documentation/content/en/articles/committers-guide/_index.adoc:843
msgid ""
"which tells Git that ls.c has been fixed and to continue the rebase "
"operation. Since there was a conflict, you will get kicked into the editor "
@@ -1813,7 +1818,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:847
+#: documentation/content/en/articles/committers-guide/_index.adoc:848
msgid ""
"If you get stuck during the rebase, do not panic. git rebase --abort will "
"take you back to a clean slate. It is important, though, to start with an "
@@ -1823,7 +1828,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:850
+#: documentation/content/en/articles/committers-guide/_index.adoc:851
msgid ""
"For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-"
"to-git-merge-and-git-rebase/ provides a rather extensive treatment. It is a "
@@ -1832,20 +1837,20 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:851
+#: documentation/content/en/articles/committers-guide/_index.adoc:852
#, no-wrap
msgid "Switching to a Different FreeBSD Branch"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:854
+#: documentation/content/en/articles/committers-guide/_index.adoc:855
msgid ""
"If you wish to shift from stable/12 to the current branch. If you have a "
"deep clone, the following will suffice:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:858
+#: documentation/content/en/articles/committers-guide/_index.adoc:859
#, no-wrap
msgid ""
"% git checkout main\n"
@@ -1853,7 +1858,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:863
+#: documentation/content/en/articles/committers-guide/_index.adoc:864
msgid ""
"If you have a local branch, though, there are one or two caveats. First, "
"rebase will rewrite history, so you will likely want to do something to save "
@@ -1863,7 +1868,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:868
+#: documentation/content/en/articles/committers-guide/_index.adoc:869
#, no-wrap
msgid ""
"% git checkout no-color-ls\n"
@@ -1872,7 +1877,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:875
+#: documentation/content/en/articles/committers-guide/_index.adoc:876
msgid ""
"What the above does is checkout no-color-ls. Then create a new name for it "
"(no-color-ls-stable-12) in case you need to get back to it. Then you rebase "
@@ -1883,13 +1888,13 @@ msgid ""
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:876
+#: documentation/content/en/articles/committers-guide/_index.adoc:877
#, no-wrap
msgid "Migrating from an existing Git clone"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:878
+#: documentation/content/en/articles/committers-guide/_index.adoc:879
msgid ""
"If you have work based on a previous Git conversion or a locally running git-"
"svn conversion, migrating to new repository can encounter problems because "
@@ -1897,14 +1902,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:880
+#: documentation/content/en/articles/committers-guide/_index.adoc:881
msgid ""
"When you have only a few local changes, the easiest way would be to cherry-"
"pick those changes to the new base:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:884
+#: documentation/content/en/articles/committers-guide/_index.adoc:885
#, no-wrap
msgid ""
"% git checkout main\n"
@@ -1912,18 +1917,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:886
+#: documentation/content/en/articles/committers-guide/_index.adoc:887
msgid "Or alternatively, do the same thing with rebase:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:889
+#: documentation/content/en/articles/committers-guide/_index.adoc:890
#, no-wrap
msgid "% git rebase --onto main master your_branch\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:893
+#: documentation/content/en/articles/committers-guide/_index.adoc:894
msgid ""
"If you do have a lot of changes, you would probably want to perform a merge "
"instead. The idea is to create a merge point that consolidates the history "
@@ -1931,55 +1936,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:895
+#: documentation/content/en/articles/committers-guide/_index.adoc:896
msgid ""
"You can find out by looking up the same commit that are found on both "
"parents:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:898
+#: documentation/content/en/articles/committers-guide/_index.adoc:899
#, no-wrap
msgid "% git show old_branch\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:900
+#: documentation/content/en/articles/committers-guide/_index.adoc:901
msgid "You will see a commit message, now search for that in the new branch:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:903
+#: documentation/content/en/articles/committers-guide/_index.adoc:904
#, no-wrap
msgid "% git log --grep=\"commit message on old_branch\" freebsd/main\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:905
+#: documentation/content/en/articles/committers-guide/_index.adoc:906
msgid ""
"You would help locate the commit hash on the new main branch, create a "
"helper branch (in the example we call it 'stage') from that hash:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:908
+#: documentation/content/en/articles/committers-guide/_index.adoc:909
#, no-wrap
msgid "% git checkout -b stage _hash_found_from_git_log_\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:910
+#: documentation/content/en/articles/committers-guide/_index.adoc:911
msgid "Then perform a merge of the old branch:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:913
+#: documentation/content/en/articles/committers-guide/_index.adoc:914
#, no-wrap
msgid "% git merge -s ours -m \"Mark old branch as merged\" old_branch\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:916
+#: documentation/content/en/articles/committers-guide/_index.adoc:917
msgid ""
"With that, it's possible to merge your work branch or the main branch in any "
"order without problem. Eventually, when you are ready to commit your work "
@@ -1988,19 +1993,19 @@ msgid ""
msgstr ""
#. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:918
+#: documentation/content/en/articles/committers-guide/_index.adoc:919
#, no-wrap
msgid "MFC (Merge From Current) Procedures"
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:919
+#: documentation/content/en/articles/committers-guide/_index.adoc:920
#, no-wrap
msgid "Summary"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:923
+#: documentation/content/en/articles/committers-guide/_index.adoc:924
msgid ""
"MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --"
"amend` to adjust the commit message. For multiple commits, use `git rebase -"
@@ -2008,13 +2013,13 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:924
+#: documentation/content/en/articles/committers-guide/_index.adoc:925
#, no-wrap
msgid "Single commit MFC"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:930
+#: documentation/content/en/articles/committers-guide/_index.adoc:931
#, no-wrap
msgid ""
"% git checkout stable/X\n"
@@ -2022,7 +2027,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:934
+#: documentation/content/en/articles/committers-guide/_index.adoc:935
msgid ""
"For MFC commits, for example a vendor import, you would need to specify one "
"parent for cherry-pick purposes. Normally, that would be the \"first parent"
@@ -2030,7 +2035,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:939
+#: documentation/content/en/articles/committers-guide/_index.adoc:940
#, no-wrap
msgid ""
"% git checkout stable/X\n"
@@ -2038,58 +2043,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:942
+#: documentation/content/en/articles/committers-guide/_index.adoc:943
msgid ""
"If things go wrong, you'll either need to abort the cherry-pick with `git "
"cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:945
+#: documentation/content/en/articles/committers-guide/_index.adoc:946
msgid ""
"Once the cherry-pick is finished, push with `git push`. If you get an error "
"due to losing the commit race, use `git pull --rebase` and try to push again."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:946
+#: documentation/content/en/articles/committers-guide/_index.adoc:947
#, no-wrap
msgid "MFC to RELENG branch"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:950
+#: documentation/content/en/articles/committers-guide/_index.adoc:951
msgid ""
"MFCs to branches that require approval require a bit more care. The process "
"is the same for either a typical merge or an exceptional direct commit."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:952
+#: documentation/content/en/articles/committers-guide/_index.adoc:953
msgid ""
"Merge or direct commit to the appropriate `stable/X` branch first before "
"merging to the `releng/X.Y` branch."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:953
+#: documentation/content/en/articles/committers-guide/_index.adoc:954
msgid ""
"Use the hash that's in the `stable/X` branch for the MFC to `releng/X.Y` "
"branch."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:954
+#: documentation/content/en/articles/committers-guide/_index.adoc:955
msgid "Leave both \"cherry picked from\" lines in the commit message."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:955
+#: documentation/content/en/articles/committers-guide/_index.adoc:956
msgid "Be sure to add the `Approved by:` line when you are in the editor."
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:960
+#: documentation/content/en/articles/committers-guide/_index.adoc:961
#, no-wrap
msgid ""
"% git checkout releng/13.0\n"
@@ -2097,20 +2102,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:963
+#: documentation/content/en/articles/committers-guide/_index.adoc:964
msgid ""
"If you forget to to add the `Approved by:` line, you can do a `git commit --"
"amend` to edit the commit message before you push the change."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:964
+#: documentation/content/en/articles/committers-guide/_index.adoc:965
#, no-wrap
msgid "Multiple commit MFC"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:975
+#: documentation/content/en/articles/committers-guide/_index.adoc:976
#, no-wrap
msgid ""
"% git checkout -b tmp-branch stable/X\n"
@@ -2123,12 +2128,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:978
+#: documentation/content/en/articles/committers-guide/_index.adoc:979
msgid "If the push fails due to losing the commit race, rebase and try again:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:986
+#: documentation/content/en/articles/committers-guide/_index.adoc:987
#, no-wrap
msgid ""
"% git checkout stable/X\n"
@@ -2139,12 +2144,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:989
+#: documentation/content/en/articles/committers-guide/_index.adoc:990
msgid "Once the MFC is complete, you can delete the temporary branch:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:994
+#: documentation/content/en/articles/committers-guide/_index.adoc:995
#, no-wrap
msgid ""
"% git checkout stable/X\n"
@@ -2152,13 +2157,13 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:996
+#: documentation/content/en/articles/committers-guide/_index.adoc:997
#, no-wrap
msgid "MFC a vendor import"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1001
+#: documentation/content/en/articles/committers-guide/_index.adoc:1002
msgid ""
"Vendor imports are the only thing in the tree that creates a merge commit in "
"the main line. Cherry picking merge commits into stable/XX presents an "
@@ -2168,20 +2173,20 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1005
+#: documentation/content/en/articles/committers-guide/_index.adoc:1006
#, no-wrap
msgid "% git cherry-pick -x -m 1 $HASH\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1008
+#: documentation/content/en/articles/committers-guide/_index.adoc:1009
msgid ""
"is typically what you want. This will tell cherry-pick to apply the correct "
"diff."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1012
+#: documentation/content/en/articles/committers-guide/_index.adoc:1013
msgid ""
"There are some, hopefully, rare cases where it's possible that the mainline "
"was merged backwards by the conversion script. Should that be the case (and "
@@ -2190,7 +2195,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1016
+#: documentation/content/en/articles/committers-guide/_index.adoc:1017
#, no-wrap
msgid ""
"% git cherry-pick --abort\n"
@@ -2198,93 +2203,93 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1018
+#: documentation/content/en/articles/committers-guide/_index.adoc:1019
msgid "to do that. The `--abort` will cleanup the failed first attempt."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1019
+#: documentation/content/en/articles/committers-guide/_index.adoc:1020
#, no-wrap
msgid "Redoing a MFC"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1023
+#: documentation/content/en/articles/committers-guide/_index.adoc:1024
msgid ""
"If you do a MFC, and it goes horribly wrong and you want to start over, then "
"the easiest way is to use `git reset --hard` like so:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1026
+#: documentation/content/en/articles/committers-guide/_index.adoc:1027
#, no-wrap
msgid "% git reset --hard freebsd/stable/12\n"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1029
+#: documentation/content/en/articles/committers-guide/_index.adoc:1030
msgid ""
"though if you have some revs you want to keep, and others you don't, using "
"'git rebase -i' is better."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1030
+#: documentation/content/en/articles/committers-guide/_index.adoc:1031
#, no-wrap
msgid "Considerations when MFCing"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1033
+#: documentation/content/en/articles/committers-guide/_index.adoc:1034
msgid ""
"When committing source commits to stable and releng branches, we have the "
"following goals:"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1035
+#: documentation/content/en/articles/committers-guide/_index.adoc:1036
msgid ""
"Clearly mark direct commits distinct from commits that land a change from "
"another branch."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1036
+#: documentation/content/en/articles/committers-guide/_index.adoc:1037
msgid "Avoid introducing known breakage into stable and releng branches."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1037
+#: documentation/content/en/articles/committers-guide/_index.adoc:1038
msgid ""
"Allow developers to determine which changes have or have not been landed "
"from one branch to another."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1039
+#: documentation/content/en/articles/committers-guide/_index.adoc:1040
msgid ""
"With Subversion, we used the following practices to achieve these goals:"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1041
+#: documentation/content/en/articles/committers-guide/_index.adoc:1042
msgid ""
"Using 'MFC' and 'MFS' tags to mark commits that merged changes from another "
"branch."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1042
+#: documentation/content/en/articles/committers-guide/_index.adoc:1043
msgid "Squashing fixup commits into the main commit when merging a change."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1043
+#: documentation/content/en/articles/committers-guide/_index.adoc:1044
msgid "Recording mergeinfo so that `svn mergeinfo --show-revs` worked."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1047
+#: documentation/content/en/articles/committers-guide/_index.adoc:1048
msgid ""
"With Git, we will need to use different strategies to achieve the same "
"goals. This document aims to define best practices when merging source "
@@ -2294,7 +2299,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1050
+#: documentation/content/en/articles/committers-guide/_index.adoc:1051
msgid ""
"One general note: due to technical differences with Git, we will not be "
"using Git \"merge commits\" (created via `git merge`) in stable or releng "
@@ -2305,13 +2310,13 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1051
+#: documentation/content/en/articles/committers-guide/_index.adoc:1052
#, no-wrap
msgid "Finding Eligible Hashes to MFC"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1056
+#: documentation/content/en/articles/committers-guide/_index.adoc:1057
msgid ""
"Git provides some built-in support for this via the `git cherry` and `git "
"log --cherry` commands. These commands compare the raw diffs of commits "
@@ -2322,12 +2327,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1058
+#: documentation/content/en/articles/committers-guide/_index.adoc:1059
msgid "There are a few options for resolving this:"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1062
+#: documentation/content/en/articles/committers-guide/_index.adoc:1063
msgid ""
"We could ban squashing of commits and instead require that committers stage "
"all of the fixup / follow-up commits to stable into a single push. This "
@@ -2338,7 +2343,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1066
+#: documentation/content/en/articles/committers-guide/_index.adoc:1067
msgid ""
"We could adopt a consistent style for describing MFCs and write our own "
"tooling to wrap around `git cherry` to determine the list of eligible "
@@ -2351,24 +2356,24 @@ msgid ""
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1067
+#: documentation/content/en/articles/committers-guide/_index.adoc:1068
#, no-wrap
msgid "Commit message standards"
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1068
+#: documentation/content/en/articles/committers-guide/_index.adoc:1069
#, no-wrap
msgid "Marking MFCs"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1071
+#: documentation/content/en/articles/committers-guide/_index.adoc:1072
msgid "The project has adopted the following practice for marking MFCs:"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1073
+#: documentation/content/en/articles/committers-guide/_index.adoc:1074
msgid ""
"Use the `-x` flag with `git cherry-pick`. This adds a line to the commit "
"message that includes the hash of the original commit when merging. Since it "
@@ -2377,19 +2382,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1075
+#: documentation/content/en/articles/committers-guide/_index.adoc:1076
msgid ""
"When merging multiple commits, keep all the \"cherry picked from\" lines."
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1076
+#: documentation/content/en/articles/committers-guide/_index.adoc:1077
#, no-wrap
msgid "Trim Metadata?"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1080
+#: documentation/content/en/articles/committers-guide/_index.adoc:1081
msgid ""
"One area that was not clearly documented with Subversion (or even CVS) is "
"how to format metadata in log messages for MFC commits. Should it include "
@@ -2398,7 +2403,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1089
+#: documentation/content/en/articles/committers-guide/_index.adoc:1090
msgid ""
"Historical practice has varied, though some of the variance is by field. "
"For example, MFCs that are relevant to a PR generally include the PR field "
@@ -2417,7 +2422,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1093
+#: documentation/content/en/articles/committers-guide/_index.adoc:1094
msgid ""
"For MFCs regulated by re@, new metadata fields are added, such as the "
"Approved by tag for approved commits. This new metadata will have to be "
@@ -2427,14 +2432,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1096
+#: documentation/content/en/articles/committers-guide/_index.adoc:1097
msgid ""
"Preserving existing metadata provides a very simple workflow. Developers "
"can just use `git cherry-pick -x` without having to edit the log message."
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1099
+#: documentation/content/en/articles/committers-guide/_index.adoc:1100
msgid ""
"If instead we choose to adjust metadata in MFCs, developers will have to "
"edit log messages explicitly via the use of `git cherry-pick --edit` or `git "
@@ -2444,26 +2449,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1101
+#: documentation/content/en/articles/committers-guide/_index.adoc:1102
msgid ""
"The bottom line is that developers will likely need to curate their commit "
"message for MFCs that are non-trivial."
msgstr ""
#. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1102
+#: documentation/content/en/articles/committers-guide/_index.adoc:1103
#, no-wrap
msgid "Examples"
msgstr ""
#. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1104
+#: documentation/content/en/articles/committers-guide/_index.adoc:1105
#, no-wrap
msgid "Merging a Single Subversion Commit"
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1108
+#: documentation/content/en/articles/committers-guide/_index.adoc:1109
msgid ""
"This walks through the process of merging a commit to stable/12 that was "
"originally committed to head in Subversion. In this case, the original "
@@ -2471,7 +2476,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1111
+#: documentation/content/en/articles/committers-guide/_index.adoc:1112
msgid ""
"The first step is to map the Subversion commit to a Git hash. Once you have "
"fetched refs/notes/commits, you can pass the revision number to `git log --"
@@ -2479,7 +2484,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1118
+#: documentation/content/en/articles/committers-guide/_index.adoc:1119
#, no-wrap
msgid ""
"% git log main --grep 368685\n"
@@ -2489,14 +2494,14 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1120
-#: documentation/content/en/articles/committers-guide/_index.adoc:1159
+#: documentation/content/en/articles/committers-guide/_index.adoc:1121
+#: documentation/content/en/articles/committers-guide/_index.adoc:1160
#, no-wrap
msgid " Use the 't' modifier to print a ptrdiff_t.\n"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1125
+#: documentation/content/en/articles/committers-guide/_index.adoc:1126
#, no-wrap
msgid ""
" Reviewed by: imp\n"
@@ -2506,7 +2511,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1128
+#: documentation/content/en/articles/committers-guide/_index.adoc:1129
#, no-wrap
msgid ""
"Notes:\n"
@@ -2514,13 +2519,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1131
-#: documentation/content/en/articles/committers-guide/_index.adoc:1224
+#: documentation/content/en/articles/committers-guide/_index.adoc:1132
+#: documentation/content/en/articles/committers-guide/_index.adoc:1225
msgid "Next, MFC the commit to a `stable/12` checkout:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1136
+#: documentation/content/en/articles/committers-guide/_index.adoc:1137
#, no-wrap
msgid ""
"git checkout stable/12\n"
@@ -2528,7 +2533,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1141
+#: documentation/content/en/articles/committers-guide/_index.adoc:1142
msgid ""
"Git will invoke the editor. Use this to remove the metadata that only "
"applied to the original commit (Phabricator URL and Reviewed by). After the "
@@ -2536,7 +2541,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1147
+#: documentation/content/en/articles/committers-guide/_index.adoc:1148
#, no-wrap
msgid ""
"[stable/12 3e3a548c4874] Use the 't' modifier to print a ptrdiff_t.\n"
@@ -2545,12 +2550,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1150
+#: documentation/content/en/articles/committers-guide/_index.adoc:1151
msgid "The contents of the MFCd commit can be examined via `git show`:"
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1157
+#: documentation/content/en/articles/committers-guide/_index.adoc:1158
#, no-wrap
msgid ""
"% git show\n"
@@ -2560,7 +2565,7 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1162
+#: documentation/content/en/articles/committers-guide/_index.adoc:1163
#, no-wrap
msgid ""
" Obtained from: CheriBSD\n"
@@ -2568,13 +2573,13 @@ msgid ""
msgstr ""
#. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1164
+#: documentation/content/en/articles/committers-guide/_index.adoc:1165
#, no-wrap
*** 53091 LINES SKIPPED ***