2021-03-09T06:30:02Z

1 files changed, 52 insertions, 22 deletions

diff --git a/openclonk.html b/openclonk.html
index b98049bbdda1..728af6fdb05e 100644
--- a/openclonk.html
+++ b/openclonk.html
@@ -38,49 +38,79 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync openclonk
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:khoverlay repo at '/var/lib/repo-mirror-ci/sync/khoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing openclonk
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced openclonk
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>  git config pull.rebase true   # rebase
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+</pre></td></tr>
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>invocation.
+</pre></td></tr>
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing openclonk
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced openclonk
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>