2022-07-03T15:00:01Z

1 files changed, 23 insertions, 25 deletions

diff --git a/booboo.html b/booboo.html
index 8033d0d2c1ef..6ad536f7561a 100644
--- a/booboo.html
+++ b/booboo.html
@@ -44,49 +44,49 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://github.com/l29ah/booboo
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>   bd47072..2efff44  master     -&gt; origin/master
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + 2efff44...3afd710 master     -&gt; origin/master  (forced update)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Updating bd47072..2efff44
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them.
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> .../crazyflie-clients-python-2017.06.1.ebuild                        | 2 +-
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: your next pull:
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> .../crazyflie-clients-python/crazyflie-clients-python-2019.01.ebuild | 2 +-
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: 
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> dev-embedded/libmpsse/libmpsse-1.3.2.ebuild                          | 2 +-
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint:   git config pull.rebase false  # merge
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> dev-python/cflib/cflib-0.1.3.ebuild                                  | 2 +-
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint:   git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> dev-python/cflib/cflib-0.1.6.ebuild                                  | 2 +-
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint:   git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> dev-python/cflib/cflib-0.1.7.ebuild                                  | 2 +-
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: 
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> dev-python/lfmh/lfmh-1.1.1.ebuild                                    | 2 +-
+            <tr class="" id="l27"><td><a href="#l27"><span>27</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="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> dev-python/python-olm/python-olm-3.1.5.ebuild                        | 2 +-
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> dev-python/pythonocc/pythonocc-0.18.1.ebuild                         | 2 +-
+            <tr class="" id="l29"><td><a href="#l29"><span>29</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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> dev-python/pythonocc/pythonocc-9999.ebuild                           | 2 +-
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>hint: invocation.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> media-gfx/cadquery/cadquery-9999.ebuild                              | 5 -----
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> media-gfx/cq-editor/cq-editor-9999.ebuild                            | 2 +-
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>!!! failed syncing booboo
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> media-sound/scrobbler/scrobbler-1.1.4.ebuild                         | 2 +-
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> net-libs/loudmouth/loudmouth-9999.ebuild                             | 1 +
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync failed with 1
+</pre></td><td>[FATAL]</td></tr>
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Will try to re-create
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-misc/trackma/trackma-9999.ebuild                                 | 2 +-
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> sys-apps/me_cleaner/me_cleaner-9999.ebuild                           | 2 +-
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing booboo
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> 16 files changed, 15 insertions(+), 19 deletions(-)
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;...
 </pre></td></tr>
             <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced booboo
 </pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded after re-adding
 </pre></td></tr>
             <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
@@ -94,9 +94,7 @@
 </pre></td></tr>
             <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 booboo
 </pre></td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-perl/UI-Dialog-1.08: failed sourcing ebuild: perl-module: EAPI 5 not supported, (perl-module.eclass, line  32:  called die)
-</pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>