2022-12-26T18:45:01Z

1 files changed, 10 insertions, 52 deletions

diff --git a/didos.html b/didos.html
index fc235504d63b..6ee0ea6b1215 100644
--- a/didos.html
+++ b/didos.html
@@ -42,67 +42,25 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing didos
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://github.com/prototype99/didos
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + 0afd1f59...977124f9 master     -&gt; origin/master  (forced update)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced didos
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * [new branch]        nodejs-old -&gt; origin/nodejs-old
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them.
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: your next pull:
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: 
-</pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint:   git config pull.rebase false  # merge
-</pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint:   git config pull.rebase true   # rebase
-</pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint:   git config pull.ff only       # fast-forward only
-</pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: 
-</pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</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="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-</pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: invocation.
-</pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches.
-</pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>!!! failed syncing didos
-</pre></td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync failed with 1
-</pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Will try to re-create
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing didos
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/didos&#x27;...
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced didos
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded after re-adding
-</pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 didos
-</pre></td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-lang/rust-1.34.2-r3: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
+            <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * dev-lang/rust-1.34.2-r3: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * www-client/firefox-70.0.1-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
+            <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * www-client/firefox-70.0.1-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * www-client/firefox-72.0.2-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
+            <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * www-client/firefox-72.0.2-r1: failed sourcing ebuild: eapi7-ver: EAPI=7 includes all functions from this eclass, (eapi7-ver.eclass, line  61:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>