2024-11-26T14:15:00Z

1 files changed, 29 insertions, 37 deletions

diff --git a/JRG.html b/JRG.html
index 2c56d1ddbca3..f3726f01d034 100644
--- a/JRG.html
+++ b/JRG.html
@@ -46,69 +46,61 @@
 </pre></td></tr>
             <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/john-r-graham/jrg-overlay
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>   6f4c6a2..ca2a05a  master     -&gt; origin/master
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + ca2a05a...f81794c master     -&gt; origin/master  (forced update)
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 6f4c6a2..ca2a05a
+            <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.
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Fast-forward
+            <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
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> net-fs/samba/Manifest                              |  12 +
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: your next pull:
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> net-fs/samba/files/4.4/samba4.confd                |  47 +++
+            <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> net-fs/samba/files/4.4/samba4.initd-r1             |  54 +++
+            <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> net-fs/samba/files/4.4/system-auth-winbind.pam     |  18 +
+            <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> .../files/ldb-2.5.2-skip-wav-tevent-check.patch    |  12 +
+            <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> net-fs/samba/files/samba-4.18.4-pam.patch          |  29 ++
+            <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> net-fs/samba/files/samba.conf                      |   8 +
+            <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> net-fs/samba/metadata.xml                          |  38 ++
+            <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> net-fs/samba/samba-4.19.7_p1.ebuild                | 390 ++++++++++++++++++++
+            <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> net-fs/samba/samba-4.21.1_p1.ebuild                | 391 +++++++++++++++++++++
+            <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> 10 files changed, 999 insertions(+)
+            <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> create mode 100644 net-fs/samba/Manifest
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>!!! failed syncing JRG
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> create mode 100644 net-fs/samba/files/4.4/samba4.confd
-</pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> create mode 100644 net-fs/samba/files/4.4/samba4.initd-r1
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> create mode 100644 net-fs/samba/files/4.4/system-auth-winbind.pam
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> create mode 100644 net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> create mode 100644 net-fs/samba/files/samba-4.18.4-pam.patch
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> create mode 100644 net-fs/samba/files/samba.conf
+            <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="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> create mode 100644 net-fs/samba/metadata.xml
+            <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 JRG
 </pre></td></tr>
-            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> create mode 100644 net-fs/samba/samba-4.19.7_p1.ebuild
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing JRG
 </pre></td></tr>
-            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> create mode 100644 net-fs/samba/samba-4.21.1_p1.ebuild
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/JRG&#x27;...
 </pre></td></tr>
-            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced JRG
+            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced JRG
 </pre></td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
+            <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="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
+            <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="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <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="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 JRG
+            <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 JRG
 </pre></td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-misc/freeplane-bin-1.9.12: failed sourcing ebuild: desktop: EAPI 6 not supported, (desktop.eclass, line  15:  called die)
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-misc/freeplane-bin-1.9.12: failed sourcing ebuild: desktop: EAPI 6 not supported, (desktop.eclass, line  15:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * sys-apps/dtc-1.4.1: failed sourcing ebuild: multilib: EAPI 6 not supported, (multilib.eclass, line  17:  called die)
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * sys-apps/dtc-1.4.1: failed sourcing ebuild: multilib: EAPI 6 not supported, (multilib.eclass, line  17:  called die)
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>