summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--R_Overlay.html4
-rw-r--r--R_Overlay.txt4
-rw-r--r--audio-overlay.html44
-rw-r--r--audio-overlay.txt1
-rw-r--r--awesome.html44
-rw-r--r--awesome.txt1
-rw-r--r--flewkey-overlay.html30
-rw-r--r--flewkey-overlay.txt10
-rw-r--r--fusion809.html54
-rw-r--r--fusion809.txt15
-rw-r--r--index.html2
-rw-r--r--ixit.html44
-rw-r--r--ixit.txt1
-rw-r--r--jamesbroadhead.html44
-rw-r--r--jamesbroadhead.txt1
-rw-r--r--java.html50
-rw-r--r--java.txt1
-rw-r--r--poly-c.html2
-rw-r--r--poly-c.txt2
-rw-r--r--swegener.html6
-rw-r--r--swegener.txt6
-rw-r--r--xwing.html52
-rw-r--r--xwing.txt21
-rw-r--r--zugaina.html4
-rw-r--r--zugaina.txt4
25 files changed, 165 insertions, 282 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index 1a8a187a44f8..57674eb40930 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -52,7 +52,7 @@
</pre></td></tr>
<tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.35M
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.37M
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
@@ -64,7 +64,7 @@
</pre></td></tr>
<tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.69K bytes received 2.66M bytes 1.78M bytes/sec
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.69K bytes received 2.66M bytes 1.07M bytes/sec
</pre></td></tr>
<tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 62.51M speedup is 23.37
</pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index db132f2c5c7e..fba760fcc2a1 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -19,13 +19,13 @@ Total file size: 62.51M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 2.35M
+File list size: 2.37M
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
Total bytes sent: 17.69K
Total bytes received: 2.66M
-sent 17.69K bytes received 2.66M bytes 1.78M bytes/sec
+sent 17.69K bytes received 2.66M bytes 1.07M bytes/sec
total size is 62.51M speedup is 23.37
*** synced R_Overlay
* Sync succeeded
diff --git a/audio-overlay.html b/audio-overlay.html
index 61d0f313fbba..44509900f465 100644
--- a/audio-overlay.html
+++ b/audio-overlay.html
@@ -46,49 +46,47 @@
</pre></td></tr>
<tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync audio-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing audio-overlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing audio-overlay
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> 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> git config pull.ff only # fast-forward only
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</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>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>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>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>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>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>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced audio-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced audio-overlay
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 audio-overlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 audio-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/audio-overlay.txt b/audio-overlay.txt
index 2862c80215db..c871938c46a6 100644
--- a/audio-overlay.txt
+++ b/audio-overlay.txt
@@ -16,7 +16,6 @@
'uri': 'git@github.com:gentoo-audio/audio-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync audio-overlay
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing audio-overlay
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/awesome.html b/awesome.html
index d323e7f84230..1ea098cdfa10 100644
--- a/awesome.html
+++ b/awesome.html
@@ -32,47 +32,49 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync awesome
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing awesome
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing awesome
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced awesome
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced awesome
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/awesome.txt b/awesome.txt
index 0b9948c73716..7175b961b43a 100644
--- a/awesome.txt
+++ b/awesome.txt
@@ -9,6 +9,7 @@
'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}],
'status': 'unofficial'}
$ pmaint sync awesome
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing awesome
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/flewkey-overlay.html b/flewkey-overlay.html
index 9e78c4b55aca..c403a73e688a 100644
--- a/flewkey-overlay.html
+++ b/flewkey-overlay.html
@@ -60,35 +60,19 @@
</pre></td></tr>
<tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://git.sdf.org/flewkey/flewkey-overlay
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 2721478..5a1ead4 master -&gt; origin/master
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced flewkey-overlay
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating 2721478..5a1ead4
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> media-plugins/geonkick/Manifest | 4 ++-
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> media-plugins/geonkick/geonkick-2.7.3.ebuild | 41 ++++++++++++++++++++++++++++
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flewkey-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> media-plugins/geonkick/geonkick-9999.ebuild | 7 +++--
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> 3 files changed, 48 insertions(+), 4 deletions(-)
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> create mode 100644 media-plugins/geonkick/geonkick-2.7.3.ebuild
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced flewkey-overlay
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flewkey-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt
index 18170b85a9d7..eaef46d411d0 100644
--- a/flewkey-overlay.txt
+++ b/flewkey-overlay.txt
@@ -23,15 +23,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
-From https://git.sdf.org/flewkey/flewkey-overlay
- 2721478..5a1ead4 master -> origin/master
-Updating 2721478..5a1ead4
-Fast-forward
- media-plugins/geonkick/Manifest | 4 ++-
- media-plugins/geonkick/geonkick-2.7.3.ebuild | 41 ++++++++++++++++++++++++++++
- media-plugins/geonkick/geonkick-9999.ebuild | 7 +++--
- 3 files changed, 48 insertions(+), 4 deletions(-)
- create mode 100644 media-plugins/geonkick/geonkick-2.7.3.ebuild
+Already up to date.
*** synced flewkey-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fusion809.html b/fusion809.html
index c248764ef226..35aa28c84892 100644
--- a/fusion809.html
+++ b/fusion809.html
@@ -66,59 +66,33 @@
</pre></td></tr>
<tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://github.com/fusion809/fusion809-overlay
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 19923ca4..9b11de01 master -&gt; origin/master
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced fusion809
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 19923ca4..9b11de01
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-editors/gvim/Manifest | 2 +-
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-editors/gvim/{gvim-8.2.2607.ebuild =&gt; gvim-8.2.2608.ebuild} | 0
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> app-editors/vim-core/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../vim-core/{vim-core-8.2.2607.ebuild =&gt; vim-core-8.2.2608.ebuild} | 0
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> app-editors/vim/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> app-editors/vim/{vim-8.2.2607.ebuild =&gt; vim-8.2.2608.ebuild} | 0
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> 6 files changed, 3 insertions(+), 3 deletions(-)
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> rename app-editors/gvim/{gvim-8.2.2607.ebuild =&gt; gvim-8.2.2608.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> rename app-editors/vim-core/{vim-core-8.2.2607.ebuild =&gt; vim-core-8.2.2608.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> rename app-editors/vim/{vim-8.2.2607.ebuild =&gt; vim-8.2.2608.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced fusion809
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</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
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
-</pre></td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-editors/gvim-8.2.2608: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-editors/gvim-8.2.2608: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-editors/vim-8.2.2608: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-editors/vim-8.2.2608: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/fusion809.txt b/fusion809.txt
index f97824820a29..43eacb443438 100644
--- a/fusion809.txt
+++ b/fusion809.txt
@@ -26,20 +26,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
-From https://github.com/fusion809/fusion809-overlay
- 19923ca4..9b11de01 master -> origin/master
-Updating 19923ca4..9b11de01
-Fast-forward
- app-editors/gvim/Manifest | 2 +-
- app-editors/gvim/{gvim-8.2.2607.ebuild => gvim-8.2.2608.ebuild} | 0
- app-editors/vim-core/Manifest | 2 +-
- .../vim-core/{vim-core-8.2.2607.ebuild => vim-core-8.2.2608.ebuild} | 0
- app-editors/vim/Manifest | 2 +-
- app-editors/vim/{vim-8.2.2607.ebuild => vim-8.2.2608.ebuild} | 0
- 6 files changed, 3 insertions(+), 3 deletions(-)
- rename app-editors/gvim/{gvim-8.2.2607.ebuild => gvim-8.2.2608.ebuild} (100%)
- rename app-editors/vim-core/{vim-core-8.2.2607.ebuild => vim-core-8.2.2608.ebuild} (100%)
- rename app-editors/vim/{vim-8.2.2607.ebuild => vim-8.2.2608.ebuild} (100%)
+Already up to date.
*** synced fusion809
* Sync succeeded
$ git log --format=%ci -1
diff --git a/index.html b/index.html
index 410be93a5733..7799d121be3f 100644
--- a/index.html
+++ b/index.html
@@ -854,7 +854,7 @@
</table>
- <address>Generated based on results from 2021-03-15 23:07:33 UTC</address>
+ <address>Generated based on results from 2021-03-15 23:22:29 UTC</address>
</body>
</html>
\ No newline at end of file
diff --git a/ixit.html b/ixit.html
index bdbfae86b13f..8bd86d13c2b3 100644
--- a/ixit.html
+++ b/ixit.html
@@ -36,47 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ixit
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ixit
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hexedit-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ixit
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <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
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+ <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
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <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,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+ <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
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ixit
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</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>*** synced ixit
</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> * Sync succeeded
</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>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</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>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ixit.txt b/ixit.txt
index 9ccf6f230d08..ec148f37d12b 100644
--- a/ixit.txt
+++ b/ixit.txt
@@ -11,6 +11,7 @@
{'type': 'git', 'uri': 'git@github.com:okias/ixit.git'}],
'status': 'unofficial'}
$ pmaint sync ixit
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ixit
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/jamesbroadhead.html b/jamesbroadhead.html
index 57762d83f57e..c572a0a55649 100644
--- a/jamesbroadhead.html
+++ b/jamesbroadhead.html
@@ -44,47 +44,49 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync jamesbroadhead
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jamesbroadhead
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hexedit-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing jamesbroadhead
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> 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>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>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>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>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>invocation.
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>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>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jamesbroadhead
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced jamesbroadhead
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
+</pre></td></tr>
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jamesbroadhead.txt b/jamesbroadhead.txt
index 6e8587a890fb..bee0826e1d49 100644
--- a/jamesbroadhead.txt
+++ b/jamesbroadhead.txt
@@ -15,6 +15,7 @@
'uri': 'git+ssh://git@git.gentoo.org/user/jamesbroadhead.git'}],
'status': 'unofficial'}
$ pmaint sync jamesbroadhead
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jamesbroadhead
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/java.html b/java.html
index 007dbbdf2989..785b4170410c 100644
--- a/java.html
+++ b/java.html
@@ -40,53 +40,55 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync java
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing java
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hexedit-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hexedit-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing java
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: 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>commands sometime before your next pull:
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>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>
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> 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> git config pull.ff only # fast-forward only
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> 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>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>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>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>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>invocation.
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>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>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced java
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</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>*** synced java
</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> * Sync succeeded
</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>$ git log --format=%ci -1
</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 java
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java
+</pre></td></tr>
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/java.txt b/java.txt
index d116fdd1ff5f..dc4975c078b7 100644
--- a/java.txt
+++ b/java.txt
@@ -13,6 +13,7 @@
'uri': 'git+ssh://git@git.gentoo.org/proj/java.git'}],
'status': 'official'}
$ pmaint sync java
+WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing java
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
diff --git a/poly-c.html b/poly-c.html
index 0f56d4540351..8d5ce60a3dca 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -116,7 +116,7 @@
</pre></td></tr>
<tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>sent 85 bytes received 132 bytes 62.00 bytes/sec
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>sent 85 bytes received 132 bytes 86.80 bytes/sec
</pre></td></tr>
<tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
diff --git a/poly-c.txt b/poly-c.txt
index 9a674fffb687..743ec57b52e0 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -51,7 +51,7 @@ File list transfer time: 0.000 seconds
Total bytes sent: 85
Total bytes received: 132
-sent 85 bytes received 132 bytes 62.00 bytes/sec
+sent 85 bytes received 132 bytes 86.80 bytes/sec
total size is 32 speedup is 0.15
*** synced poly-c
* Sync succeeded
diff --git a/swegener.html b/swegener.html
index 54b10406166f..52fbb5e15808 100644
--- a/swegener.html
+++ b/swegener.html
@@ -98,15 +98,15 @@
</pre></td></tr>
<tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total bytes sent: 143
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total bytes sent: 139
</pre></td></tr>
<tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes received: 5.09K
</pre></td></tr>
<tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 1.50K bytes/sec
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>sent 139 bytes received 5.09K bytes 2.09K bytes/sec
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.78K speedup is 20.59
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.78K speedup is 20.61
</pre></td></tr>
<tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced swegener
</pre></td></tr>
diff --git a/swegener.txt b/swegener.txt
index b4c83d43852b..ba2cb2af9475 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -42,11 +42,11 @@ Matched data: 0 bytes
File list size: 5.00K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 143
+Total bytes sent: 139
Total bytes received: 5.09K
-sent 143 bytes received 5.09K bytes 1.50K bytes/sec
-total size is 107.78K speedup is 20.59
+sent 139 bytes received 5.09K bytes 2.09K bytes/sec
+total size is 107.78K speedup is 20.61
*** synced swegener
* Sync succeeded
$ stat --format=%y .
diff --git a/xwing.html b/xwing.html
index 8fb2ea79ac89..421bb7e167ef 100644
--- a/xwing.html
+++ b/xwing.html
@@ -86,57 +86,15 @@
</pre></td></tr>
<tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced xwing
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Contact Name : webmaster@xwing.info
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
</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>Number of files: 183 (reg: 121, dir: 62)
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of created files: 0
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of regular files transferred: 26
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Total file size: 143.62K bytes
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Total transferred file size: 33.64K bytes
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Literal data: 33.64K bytes
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>File list size: 6.01K
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Total bytes sent: 670
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Total bytes received: 24.68K
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>sent 670 bytes received 24.68K bytes 10.14K bytes/sec
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>total size is 143.62K speedup is 5.67
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced xwing
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xwing.txt b/xwing.txt
index d4b403fefb0b..c40eb8076e29 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -36,27 +36,6 @@ Total bytes received: 134
sent 85 bytes received 134 bytes 87.60 bytes/sec
total size is 32 speedup is 0.15
-This is xwing.info / alderaan.xwing.info
-
-Contact Name : webmaster@xwing.info
-
-
-Number of files: 183 (reg: 121, dir: 62)
-Number of created files: 0
-Number of deleted files: 0
-Number of regular files transferred: 26
-Total file size: 143.62K bytes
-Total transferred file size: 33.64K bytes
-Literal data: 33.64K bytes
-Matched data: 0 bytes
-File list size: 6.01K
-File list generation time: 0.001 seconds
-File list transfer time: 0.000 seconds
-Total bytes sent: 670
-Total bytes received: 24.68K
-
-sent 670 bytes received 24.68K bytes 10.14K bytes/sec
-total size is 143.62K speedup is 5.67
*** synced xwing
* Sync succeeded
$ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index 515ce6881030..c75e3145c956 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -52,7 +52,7 @@
</pre></td></tr>
<tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 43.68K
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 44.83K
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
@@ -64,7 +64,7 @@
</pre></td></tr>
<tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 495 bytes received 46.57K bytes 18.83K bytes/sec
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 495 bytes received 46.57K bytes 13.45K bytes/sec
</pre></td></tr>
<tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 2.19M speedup is 46.52
</pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index d420616c8e2e..a23da5a5a501 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -19,13 +19,13 @@ Total file size: 2.19M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 43.68K
+File list size: 44.83K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
Total bytes sent: 495
Total bytes received: 46.57K
-sent 495 bytes received 46.57K bytes 18.83K bytes/sec
+sent 495 bytes received 46.57K bytes 13.45K bytes/sec
total size is 2.19M speedup is 46.52
*** synced zugaina
* Sync succeeded