2021-10-02T22:30:01Z

1 files changed, 58 insertions, 18 deletions

diff --git a/libressl.html b/libressl.html
index 6420f2e84421..bb3286fbb20a 100644
--- a/libressl.html
+++ b/libressl.html
@@ -42,41 +42,81 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/proj/libressl
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>   0c75974..703e442  master     -&gt; origin/master
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + 703e442...00e90e5 master     -&gt; origin/master  (forced update)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Updating 0c75974..703e442
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>hint: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> dev-lang/python/Manifest                           |   2 +-
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> ...thon-3.9.6_p1.ebuild =&gt; python-3.9.6_p2.ebuild} |   4 +-
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: 
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> dev-qt/qtnetwork/Manifest                          |   1 +
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint:   git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> .../files/qtnetwork-5.15.2-r11-libressl.patch      | 407 +++++++++++++++++++++
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint:   git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild       |  80 ++++
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint:   git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> 5 files changed, 491 insertions(+), 3 deletions(-)
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: 
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> rename dev-lang/python/{python-3.9.6_p1.ebuild =&gt; python-3.9.6_p2.ebuild} (98%)
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> create mode 100644 dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> create mode 100644 dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced libressl
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Committer identity unknown
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** Please tell me who you are.
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 libressl
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Run
+</pre></td></tr>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>  git config --global user.email &quot;you@example.com&quot;
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>  git config --global user.name &quot;Your Name&quot;
+</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>to set your account&#x27;s default identity.
+</pre></td></tr>
+            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Omit --global to set the identity only in this repository.
+</pre></td></tr>
+            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>
+</pre></td></tr>
+            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>fatal: empty ident name (for &lt;repomirrorci@jacamar.gentoo.org&gt;) not allowed
+</pre></td></tr>
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>!!! failed syncing libressl
+</pre></td></tr>
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync failed with 1
+</pre></td><td>[FATAL]</td></tr>
+            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Will try to re-create
+</pre></td></tr>
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync libressl
+</pre></td></tr>
+            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing libressl
+</pre></td></tr>
+            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;...
+</pre></td></tr>
+            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced libressl
+</pre></td></tr>
+            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded after re-adding
+</pre></td></tr>
+            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 libressl
+</pre></td></tr>
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>