summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-04-16 14:06:54 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-04-16 14:06:54 +0000
commitaeaa04f00d7742509a6a21fe9f04382549747412 (patch)
tree8ac16ccc5e4c570aaf4246aa3a83ab38b7021768
parent2021-04-16T13:45:01Z (diff)
downloadrepos-aeaa04f00d7742509a6a21fe9f04382549747412.tar.gz
repos-aeaa04f00d7742509a6a21fe9f04382549747412.tar.bz2
repos-aeaa04f00d7742509a6a21fe9f04382549747412.zip
2021-04-16T14:00:01Z
-rw-r--r--R_Overlay.html6
-rw-r--r--R_Overlay.txt6
-rw-r--r--gentoo.html26
-rw-r--r--gentoo.txt8
-rw-r--r--index.html2
-rw-r--r--plex-overlay.html44
-rw-r--r--plex-overlay.txt1
-rw-r--r--powerman.html44
-rw-r--r--powerman.txt1
-rw-r--r--pross.html44
-rw-r--r--pross.txt1
-rw-r--r--swegener.html6
-rw-r--r--swegener.txt6
-rw-r--r--xwing.html52
-rw-r--r--xwing.txt21
-rw-r--r--zugaina.html8
-rw-r--r--zugaina.txt8
17 files changed, 169 insertions, 115 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index c964e3f94dbe..58c618d3f89f 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -52,19 +52,19 @@
</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.44M
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.24M
</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>
<tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.91K
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.90K
</pre></td></tr>
<tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 2.75M
</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.91K bytes received 2.75M bytes 1.11M bytes/sec
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.90K bytes received 2.75M bytes 1.11M bytes/sec
</pre></td></tr>
<tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 65.81M speedup is 23.81
</pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index d058701384b7..6dbcc477d300 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -19,13 +19,13 @@ Total file size: 65.81M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 2.44M
+File list size: 2.24M
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 17.91K
+Total bytes sent: 17.90K
Total bytes received: 2.75M
-sent 17.91K bytes received 2.75M bytes 1.11M bytes/sec
+sent 17.90K bytes received 2.75M bytes 1.11M bytes/sec
total size is 65.81M speedup is 23.81
*** synced R_Overlay
* Sync succeeded
diff --git a/gentoo.html b/gentoo.html
index 8dc48944075c..cc02005cdd3c 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -66,31 +66,19 @@
</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://anongit.gentoo.org/git/repo/gentoo
+ <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> c0068bb3863..92b8c2bfa58 master -&gt; origin/master
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gentoo
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating c0068bb3863..92b8c2bfa58
+ <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> dev-java/bcel/bcel-6.5.0-r1.ebuild | 80 ++++++++++++++++++++++++++++++++++++++
+ <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> 1 file changed, 80 insertions(+)
+ <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 gentoo
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> create mode 100644 dev-java/bcel/bcel-6.5.0-r1.ebuild
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
+ <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/gentoo.txt b/gentoo.txt
index 5a05f9e31a38..0f8af6ffa599 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,13 +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://anongit.gentoo.org/git/repo/gentoo
- c0068bb3863..92b8c2bfa58 master -> origin/master
-Updating c0068bb3863..92b8c2bfa58
-Fast-forward
- dev-java/bcel/bcel-6.5.0-r1.ebuild | 80 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 80 insertions(+)
- create mode 100644 dev-java/bcel/bcel-6.5.0-r1.ebuild
+Already up to date.
*** synced gentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/index.html b/index.html
index 6edf822ed352..11a4a26fbee5 100644
--- a/index.html
+++ b/index.html
@@ -775,7 +775,7 @@
</table>
- <address>Generated based on results from 2021-04-16 13:51:52 UTC</address>
+ <address>Generated based on results from 2021-04-16 14:06:48 UTC</address>
</body>
</html>
\ No newline at end of file
diff --git a/plex-overlay.html b/plex-overlay.html
index a972f3e6c942..ee7f3f0780d6 100644
--- a/plex-overlay.html
+++ b/plex-overlay.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 plex-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing plex-overlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#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 plex-overlay
</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 plex-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> * Sync succeeded
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced plex-overlay
</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 plex-overlay
+ <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 plex-overlay
+</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/plex-overlay.txt b/plex-overlay.txt
index 55adf04e7e67..3b2a5cd32b59 100644
--- a/plex-overlay.txt
+++ b/plex-overlay.txt
@@ -11,6 +11,7 @@
'uri': 'https://github.com/comio/plex-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync plex-overlay
+WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing plex-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/powerman.html b/powerman.html
index 981cbfd34e24..8ef9824aa432 100644
--- a/powerman.html
+++ b/powerman.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 powerman
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing powerman
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#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 powerman
</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 powerman
+ <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 powerman
</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 powerman
+ <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 powerman
+</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/powerman.txt b/powerman.txt
index 73b437ee1ccb..47dc4ff8dee9 100644
--- a/powerman.txt
+++ b/powerman.txt
@@ -9,6 +9,7 @@
'uri': 'https://github.com/powerman/powerman-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync powerman
+WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing powerman
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/pross.html b/pross.html
index 308aff5365bd..17657d7077c4 100644
--- a/pross.html
+++ b/pross.html
@@ -34,47 +34,49 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pross
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing pross
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#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="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing pross
</pre></td></tr>
- <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
+ <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
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+ <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
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <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
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <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,
+ <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
</pre></td></tr>
- <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
+ <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,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+ <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
</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>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+ <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>*** synced pross
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pross
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <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 pross
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
+ <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 pross
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pross.txt b/pross.txt
index 24c485676669..1e970bd4baa2 100644
--- a/pross.txt
+++ b/pross.txt
@@ -10,6 +10,7 @@
'uri': 'https://github.com/Pross/pross-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync pross
+WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pross
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/swegener.html b/swegener.html
index 6a2366cd56e2..373d2bc9a671 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 1.49K bytes/sec
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.84K speedup is 20.60
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>total size is 107.84K speedup is 20.62
</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 b3f2ff62a483..ff77fb356b21 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.84K speedup is 20.60
+sent 139 bytes received 5.09K bytes 1.49K bytes/sec
+total size is 107.84K speedup is 20.62
*** synced swegener
* Sync succeeded
$ stat --format=%y .
diff --git a/xwing.html b/xwing.html
index 1b452dc02893..0f297be7290b 100644
--- a/xwing.html
+++ b/xwing.html
@@ -86,15 +86,57 @@
</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>*** synced xwing
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ stat --format=%y .
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Contact Name : webmaster@xwing.info
</pre></td></tr>
- <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
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <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: 176 (reg: 115, dir: 61)
+</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: 24
+</pre></td></tr>
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Total file size: 136.37K bytes
+</pre></td></tr>
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Total transferred file size: 29.18K bytes
+</pre></td></tr>
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Literal data: 29.18K 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: 5.80K
+</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: 631
+</pre></td></tr>
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Total bytes received: 21.33K
+</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 631 bytes received 21.33K bytes 8.78K bytes/sec
+</pre></td></tr>
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>total size is 136.37K speedup is 6.21
+</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
</pre></td></tr>
</table>
diff --git a/xwing.txt b/xwing.txt
index a85b96026af8..13773737ae97 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -36,6 +36,27 @@ Total bytes received: 133
sent 85 bytes received 133 bytes 87.20 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: 176 (reg: 115, dir: 61)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 24
+Total file size: 136.37K bytes
+Total transferred file size: 29.18K bytes
+Literal data: 29.18K bytes
+Matched data: 0 bytes
+File list size: 5.80K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 631
+Total bytes received: 21.33K
+
+sent 631 bytes received 21.33K bytes 8.78K bytes/sec
+total size is 136.37K speedup is 6.21
*** synced xwing
* Sync succeeded
$ stat --format=%y .
diff --git a/zugaina.html b/zugaina.html
index 8193e1ec12a6..482773bbc5e5 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -52,21 +52,21 @@
</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: 40.18K
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 41.62K
</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>
<tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 482
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 490
</pre></td></tr>
<tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 44.34K
</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 482 bytes received 44.34K bytes 17.93K bytes/sec
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 490 bytes received 44.34K bytes 12.81K bytes/sec
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 2.01M speedup is 44.86
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 2.01M speedup is 44.85
</pre></td></tr>
<tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced zugaina
</pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 365cfe4d3bc3..cc4469488e84 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -19,14 +19,14 @@ Total file size: 2.01M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 40.18K
+File list size: 41.62K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 482
+Total bytes sent: 490
Total bytes received: 44.34K
-sent 482 bytes received 44.34K bytes 17.93K bytes/sec
-total size is 2.01M speedup is 44.86
+sent 490 bytes received 44.34K bytes 12.81K bytes/sec
+total size is 2.01M speedup is 44.85
*** synced zugaina
* Sync succeeded
$ stat --format=%y .