summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-12-29 05:05:00 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-12-29 05:05:00 +0000
commit95484ff1e1bbb712ce615923b0039fc38fdb0055 (patch)
treed0449745b7ac72fcc3bd60ae06bbfbfb627fc24c
parent2020-12-29T04:30:01Z (diff)
downloadrepos-95484ff1e1bbb712ce615923b0039fc38fdb0055.tar.gz
repos-95484ff1e1bbb712ce615923b0039fc38fdb0055.tar.bz2
repos-95484ff1e1bbb712ce615923b0039fc38fdb0055.zip
2020-12-29T05:00:01Z
-rw-r--r--R_Overlay.html6
-rw-r--r--R_Overlay.txt6
-rw-r--r--dilfridge.html44
-rw-r--r--dilfridge.txt1
-rw-r--r--djc.html44
-rw-r--r--djc.txt1
-rw-r--r--dlang.html44
-rw-r--r--dlang.txt1
-rw-r--r--dm9pZCAq.html44
-rw-r--r--dm9pZCAq.txt1
-rw-r--r--dmchurch.html44
-rw-r--r--dmchurch.txt1
-rw-r--r--gentoo.html44
-rw-r--r--gentoo.txt16
-rw-r--r--index.html2
-rw-r--r--poly-c.html2
-rw-r--r--poly-c.txt2
-rw-r--r--posativ.html46
-rw-r--r--posativ.txt1
-rw-r--r--qemu-init.html44
-rw-r--r--qemu-init.txt1
-rw-r--r--qgp.html44
-rw-r--r--qgp.txt1
-rw-r--r--ricerlay.html44
-rw-r--r--ricerlay.txt1
-rw-r--r--xwing.html58
-rw-r--r--xwing.txt23
-rw-r--r--zugaina.html6
-rw-r--r--zugaina.txt6
29 files changed, 307 insertions, 271 deletions
diff --git a/R_Overlay.html b/R_Overlay.html
index d1cb45608f89..a846cb2f40d0 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -50,19 +50,19 @@
</pre></td></tr>
<tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.03M
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.16M
</pre></td></tr>
<tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.09K
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.10K
</pre></td></tr>
<tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 2.42M
</pre></td></tr>
<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>sent 17.09K bytes received 2.42M bytes 974.73K bytes/sec
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.10K bytes received 2.42M bytes 1.62M bytes/sec
</pre></td></tr>
<tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 54.06M speedup is 22.19
</pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 437f6bbc3f80..dc0042e56c0c 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 54.06M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 2.03M
+File list size: 2.16M
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 17.09K
+Total bytes sent: 17.10K
Total bytes received: 2.42M
-sent 17.09K bytes received 2.42M bytes 974.73K bytes/sec
+sent 17.10K bytes received 2.42M bytes 1.62M bytes/sec
total size is 54.06M speedup is 22.19
*** syncing R_Overlay
*** synced R_Overlay
diff --git a/dilfridge.html b/dilfridge.html
index 91fc814467b0..c9245b7075cb 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -44,49 +44,47 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dilfridge
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <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>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>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>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>commands sometime before your next pull:
</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>
</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.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.rebase false # merge (the default strategy)
+ <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> git config pull.rebase true # rebase
+ <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> git config pull.ff only # fast-forward only
+ <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>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <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>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>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>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>invocation.
</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>
</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>Already up to date.
</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>*** syncing dilfridge
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing dilfridge
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dilfridge
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced dilfridge
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dilfridge.txt b/dilfridge.txt
index 2ce95887990f..f0834ba70225 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -15,7 +15,6 @@
'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}],
'status': 'official'}
$ pmaint sync dilfridge
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/djc.html b/djc.html
index 817f6b2b2fa7..93280c66d404 100644
--- a/djc.html
+++ b/djc.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 djc
</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>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
</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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing djc
+ <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>*** synced djc
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing djc
</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 djc
</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 1 djc
+ <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 1 djc
+</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/djc.txt b/djc.txt
index 984c64400bd5..fefa6dbf7311 100644
--- a/djc.txt
+++ b/djc.txt
@@ -11,6 +11,7 @@
{'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync djc
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/dlang.html b/dlang.html
index 5c819656f873..7b4ba26033aa 100644
--- a/dlang.html
+++ b/dlang.html
@@ -34,49 +34,47 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dlang
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <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
</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>discouraged. You can squelch this message by running one of the following
</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>commands sometime before your next pull:
</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>
</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> git config pull.rebase false # merge (the default strategy)
</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> git config pull.rebase true # rebase
</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.ff only # fast-forward only
</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>
</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>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <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,
</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>or --ff-only on the command line to override the configured default per
</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>invocation.
</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>
</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>Already up to date.
</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>*** syncing dlang
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dlang
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dlang
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dlang
+ <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> * Sync succeeded
+ <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>$ git log --format=%ci -1
+ <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>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dlang
</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 1 dlang
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+ <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/dlang.txt b/dlang.txt
index ab0866de377f..a51eae08a300 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -10,7 +10,6 @@
{'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
'status': 'unofficial'}
$ pmaint sync dlang
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/dm9pZCAq.html b/dm9pZCAq.html
index 0e7972ca9ef3..5fb71eb6c8d4 100644
--- a/dm9pZCAq.html
+++ b/dm9pZCAq.html
@@ -30,47 +30,49 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync dm9pZCAq
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</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> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <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>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation.
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing dm9pZCAq
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced dm9pZCAq
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing dm9pZCAq
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced dm9pZCAq
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+ <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>$ git show -q --pretty=format:%G? HEAD
+ <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>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dm9pZCAq
+ <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> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dm9pZCAq
+</pre></td></tr>
+ <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/dm9pZCAq.txt b/dm9pZCAq.txt
index abf3bac092de..b85dea105b51 100644
--- a/dm9pZCAq.txt
+++ b/dm9pZCAq.txt
@@ -8,6 +8,7 @@
'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync dm9pZCAq
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/dmchurch.html b/dmchurch.html
index 0d11dc8a45d2..4fef5c03f40a 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -42,47 +42,49 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync dmchurch
</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>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
</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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing dmchurch
+ <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>*** synced dmchurch
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing dmchurch
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dmchurch
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dmchurch
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dmchurch
+</pre></td></tr>
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dmchurch.txt b/dmchurch.txt
index 40079bdc2f4e..545b8fe4ea4f 100644
--- a/dmchurch.txt
+++ b/dmchurch.txt
@@ -14,6 +14,7 @@
'uri': 'git@github.com:dmchurch/portage-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync dmchurch
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/gentoo.html b/gentoo.html
index b82103dcde26..6255f3b5617b 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -64,49 +64,21 @@
</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>From https://anongit.gentoo.org/git/repo/gentoo
+ <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> b8e7c41ec5f..58a342de13e master -&gt; origin/master
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gentoo
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating b8e7c41ec5f..58a342de13e
+ <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>Fast-forward
+ <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> app-office/texstudio/Manifest | 1 +
+ <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-office/texstudio/texstudio-3.0.2.ebuild | 73 +++++++++++++++++++++++++++++
+ <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> dev-ml/camlp5/Manifest | 1 +
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-ml/camlp5/camlp5-7.14.ebuild | 59 +++++++++++++++++++++++
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-python/rq/Manifest | 1 -
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-python/rq/rq-1.6.1.ebuild | 63 -------------------------
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-python/rq/rq-1.7.0.ebuild | 2 +-
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> 7 files changed, 135 insertions(+), 65 deletions(-)
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> create mode 100644 app-office/texstudio/texstudio-3.0.2.ebuild
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> create mode 100644 dev-ml/camlp5/camlp5-7.14.ebuild
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> delete mode 100644 dev-python/rq/rq-1.6.1.ebuild
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</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 207c88a6aed2..106eb8ffaef8 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,21 +25,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
- b8e7c41ec5f..58a342de13e master -> origin/master
-Updating b8e7c41ec5f..58a342de13e
-Fast-forward
- app-office/texstudio/Manifest | 1 +
- app-office/texstudio/texstudio-3.0.2.ebuild | 73 +++++++++++++++++++++++++++++
- dev-ml/camlp5/Manifest | 1 +
- dev-ml/camlp5/camlp5-7.14.ebuild | 59 +++++++++++++++++++++++
- dev-python/rq/Manifest | 1 -
- dev-python/rq/rq-1.6.1.ebuild | 63 -------------------------
- dev-python/rq/rq-1.7.0.ebuild | 2 +-
- 7 files changed, 135 insertions(+), 65 deletions(-)
- create mode 100644 app-office/texstudio/texstudio-3.0.2.ebuild
- create mode 100644 dev-ml/camlp5/camlp5-7.14.ebuild
- delete mode 100644 dev-python/rq/rq-1.6.1.ebuild
+Already up to date.
*** syncing gentoo
*** synced gentoo
* Sync succeeded
diff --git a/index.html b/index.html
index 2806e92077bc..c8401f2a1040 100644
--- a/index.html
+++ b/index.html
@@ -911,7 +911,7 @@
</table>
- <address>Generated based on results from 2020-12-29 04:35:00 UTC</address>
+ <address>Generated based on results from 2020-12-29 05:04:51 UTC</address>
</body>
</html>
\ No newline at end of file
diff --git a/poly-c.html b/poly-c.html
index 1019c4fc5923..dfda562c4161 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -112,7 +112,7 @@
</pre></td></tr>
<tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes received 134 bytes 62.57 bytes/sec
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec
</pre></td></tr>
<tr class="" id="l53"><td><a href="#l53"><span>53</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 e1e0f4ef52dc..88cb6d01870e 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -49,7 +49,7 @@ File list transfer time: 0.000 seconds
Total bytes sent: 85
Total bytes received: 134
-sent 85 bytes received 134 bytes 62.57 bytes/sec
+sent 85 bytes received 134 bytes 87.60 bytes/sec
total size is 32 speedup is 0.15
*** syncing poly-c
*** synced poly-c
diff --git a/posativ.html b/posativ.html
index 1b92e3124b8f..461ea13dea78 100644
--- a/posativ.html
+++ b/posativ.html
@@ -36,49 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync posativ
</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>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).
</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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing posativ
+ <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>*** synced posativ
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing posativ
</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 posativ
</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 1 posativ
+ <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="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 posativ
+</pre></td></tr>
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/posativ.txt b/posativ.txt
index 99cd57793061..dc274116c241 100644
--- a/posativ.txt
+++ b/posativ.txt
@@ -11,6 +11,7 @@
{'type': 'git', 'uri': 'git@github.com:posativ/overlay.git'}],
'status': 'unofficial'}
$ pmaint sync posativ
+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).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/qemu-init.html b/qemu-init.html
index 28451f2cabbc..326b9fe10e0e 100644
--- a/qemu-init.html
+++ b/qemu-init.html
@@ -42,47 +42,49 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync qemu-init
</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>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).
</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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing qemu-init
+ <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>*** synced qemu-init
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing qemu-init
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced qemu-init
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qemu-init
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qemu-init
+</pre></td></tr>
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qemu-init.txt b/qemu-init.txt
index 465ea589edb6..6ca50a6e76d1 100644
--- a/qemu-init.txt
+++ b/qemu-init.txt
@@ -14,6 +14,7 @@
'uri': 'git+ssh://git@git.gentoo.org/proj/kvm-tools.git'}],
'status': 'official'}
$ pmaint sync qemu-init
+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).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/qgp.html b/qgp.html
index 986dd12bfcd5..48a1a11b9ae9 100644
--- a/qgp.html
+++ b/qgp.html
@@ -38,47 +38,49 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qgp
</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>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).
</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 "git config" with "git config --global" 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 "git config" with "git config --global" 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>*** syncing qgp
+ <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>*** synced qgp
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing qgp
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced qgp
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qgp
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qgp
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qgp.txt b/qgp.txt
index 7ebede513de4..d436d410d612 100644
--- a/qgp.txt
+++ b/qgp.txt
@@ -12,6 +12,7 @@
'uri': 'git+ssh://git@github.com:qgp/gentoo-qgp.git'}],
'status': 'unofficial'}
$ pmaint sync qgp
+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).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/ricerlay.html b/ricerlay.html
index 08f692d1c781..cff6f72c93a5 100644
--- a/ricerlay.html
+++ b/ricerlay.html
@@ -32,49 +32,47 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ricerlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>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).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</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>discouraged. You can squelch this message by running one of the following
</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>commands sometime before your next pull:
</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>
</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> git config pull.rebase false # merge (the default strategy)
</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> git config pull.rebase true # rebase
</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.ff only # fast-forward only
</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>
</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>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</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>or --ff-only on the command line to override the configured default per
</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>invocation.
</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>
</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>Already up to date.
</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>*** syncing ricerlay
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ricerlay
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced ricerlay
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ricerlay
+ <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> * Sync succeeded
+ <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>$ git log --format=%ci -1
+ <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>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ricerlay
</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 1 ricerlay
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</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/ricerlay.txt b/ricerlay.txt
index a6c6e587781a..b9ef7afcc01b 100644
--- a/ricerlay.txt
+++ b/ricerlay.txt
@@ -9,7 +9,6 @@
'uri': 'git+ssh://git@github.com/azahi/ricerlay.git'}],
'status': 'unofficial'}
$ pmaint sync ricerlay
-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).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
diff --git a/xwing.html b/xwing.html
index 47c9f6c7b8bf..d0df4ea98f49 100644
--- a/xwing.html
+++ b/xwing.html
@@ -86,17 +86,63 @@
</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>*** syncing 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>*** synced xwing
+ <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> * Sync succeeded
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Server Address : 91.134.139.206
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ stat --format=%y .
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Contact Name : webmaster@xwing.info
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Hardware : VPS 2016 SSD 3
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of files: 153 (reg: 100, dir: 53)
+</pre></td></tr>
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of created files: 0
+</pre></td></tr>
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of deleted files: 0
+</pre></td></tr>
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Number of regular files transferred: 21
+</pre></td></tr>
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total file size: 116.96K bytes
+</pre></td></tr>
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total transferred file size: 27.20K bytes
+</pre></td></tr>
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Literal data: 27.20K bytes
+</pre></td></tr>
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Matched data: 0 bytes
+</pre></td></tr>
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list size: 4.93K
+</pre></td></tr>
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list generation time: 0.001 seconds
+</pre></td></tr>
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>File list transfer time: 0.000 seconds
+</pre></td></tr>
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Total bytes sent: 560
+</pre></td></tr>
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Total bytes received: 20.14K
+</pre></td></tr>
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>sent 560 bytes received 20.14K bytes 5.91K bytes/sec
+</pre></td></tr>
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>total size is 116.96K speedup is 5.65
+</pre></td></tr>
+ <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing xwing
+</pre></td></tr>
+ <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced xwing
+</pre></td></tr>
+ <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ stat --format=%y .
+</pre></td></tr>
+ <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+</pre></td></tr>
+ <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xwing.txt b/xwing.txt
index bbdf131acc21..605d155a9524 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -36,6 +36,29 @@ 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
+
+Server Address : 91.134.139.206
+Contact Name : webmaster@xwing.info
+Hardware : VPS 2016 SSD 3
+
+
+Number of files: 153 (reg: 100, dir: 53)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 21
+Total file size: 116.96K bytes
+Total transferred file size: 27.20K bytes
+Literal data: 27.20K bytes
+Matched data: 0 bytes
+File list size: 4.93K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 560
+Total bytes received: 20.14K
+
+sent 560 bytes received 20.14K bytes 5.91K bytes/sec
+total size is 116.96K speedup is 5.65
*** syncing xwing
*** synced xwing
* Sync succeeded
diff --git a/zugaina.html b/zugaina.html
index b3bf77e8064e..73596248d1fd 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -48,19 +48,19 @@
</pre></td></tr>
<tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 28.14K
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>File list size: 35.38K
</pre></td></tr>
<tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
<tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 475
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 483
</pre></td></tr>
<tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 47.17K
</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>sent 475 bytes received 47.17K bytes 19.06K bytes/sec
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 483 bytes received 47.17K bytes 13.62K bytes/sec
</pre></td></tr>
<tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.24M speedup is 46.92
</pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index c3e7c86cdbd2..ce75873c79c6 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -17,13 +17,13 @@ Total file size: 2.24M bytes
Total transferred file size: 0 bytes
Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 28.14K
+File list size: 35.38K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 475
+Total bytes sent: 483
Total bytes received: 47.17K
-sent 475 bytes received 47.17K bytes 19.06K bytes/sec
+sent 483 bytes received 47.17K bytes 13.62K bytes/sec
total size is 2.24M speedup is 46.92
*** syncing zugaina
*** synced zugaina