diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-01 23:34:52 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-01 23:34:52 +0000 |
| commit | da8c4d3fcb249874f9af482e7e3f52e8ffa3f7dd (patch) | |
| tree | 385c1852a0a530be766408df75551f2bf53478f2 | |
| parent | 2021-05-01T23:15:01Z (diff) | |
| download | repos-da8c4d3fcb249874f9af482e7e3f52e8ffa3f7dd.tar.gz repos-da8c4d3fcb249874f9af482e7e3f52e8ffa3f7dd.tar.bz2 repos-da8c4d3fcb249874f9af482e7e3f52e8ffa3f7dd.zip | |
2021-05-01T23:30:01Z
| -rw-r--r-- | R_Overlay.html | 6 | ||||
| -rw-r--r-- | R_Overlay.txt | 6 | ||||
| -rw-r--r-- | anomen.html | 44 | ||||
| -rw-r--r-- | anomen.txt | 1 | ||||
| -rw-r--r-- | awesome.html | 44 | ||||
| -rw-r--r-- | awesome.txt | 1 | ||||
| -rw-r--r-- | barnowl.html | 44 | ||||
| -rw-r--r-- | barnowl.txt | 1 | ||||
| -rw-r--r-- | beatussum-overlay.html | 44 | ||||
| -rw-r--r-- | beatussum-overlay.txt | 1 | ||||
| -rw-r--r-- | bes.html | 44 | ||||
| -rw-r--r-- | bes.txt | 1 | ||||
| -rw-r--r-- | bezerker.html | 44 | ||||
| -rw-r--r-- | bezerker.txt | 1 | ||||
| -rw-r--r-- | bibletime.html | 44 | ||||
| -rw-r--r-- | bibletime.txt | 1 | ||||
| -rw-r--r-- | bircoph.html | 46 | ||||
| -rw-r--r-- | bircoph.txt | 1 | ||||
| -rw-r--r-- | fidonet.html | 2 | ||||
| -rw-r--r-- | fidonet.txt | 2 | ||||
| -rw-r--r-- | gentoo.html | 66 | ||||
| -rw-r--r-- | gentoo.txt | 28 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | menelkir.html | 38 | ||||
| -rw-r--r-- | menelkir.txt | 14 | ||||
| -rw-r--r-- | poly-c.html | 2 | ||||
| -rw-r--r-- | poly-c.txt | 2 | ||||
| -rw-r--r-- | swegener.html | 6 | ||||
| -rw-r--r-- | swegener.txt | 6 | ||||
| -rw-r--r-- | zugaina.html | 4 | ||||
| -rw-r--r-- | zugaina.txt | 4 |
31 files changed, 206 insertions, 344 deletions
diff --git a/R_Overlay.html b/R_Overlay.html index 7358637d6b16..f4e80d40b9c5 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -56,19 +56,19 @@ </pre></td></tr> <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Matched data: 0 bytes </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 2.45M + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 2.48M </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list generation time: 0.001 seconds </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 18.01K + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 17.99K </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 2.79M </pre></td></tr> <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 18.01K bytes received 2.79M bytes 1.12M bytes/sec + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 17.99K bytes received 2.79M bytes 1.87M bytes/sec </pre></td></tr> <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 67.49M speedup is 24.03 </pre></td></tr> diff --git a/R_Overlay.txt b/R_Overlay.txt index 90934115f485..10a64d988b6f 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -21,13 +21,13 @@ Total file size: 67.49M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 2.45M +File list size: 2.48M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 18.01K +Total bytes sent: 17.99K Total bytes received: 2.79M -sent 18.01K bytes received 2.79M bytes 1.12M bytes/sec +sent 17.99K bytes received 2.79M bytes 1.87M bytes/sec total size is 67.49M speedup is 24.03 *** synced R_Overlay * Sync succeeded diff --git a/anomen.html b/anomen.html index 84d4e784f382..b4fab4a9f16d 100644 --- a/anomen.html +++ b/anomen.html @@ -42,49 +42,47 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync anomen </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing anomen </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing anomen + <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>*** synced anomen </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced anomen + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anomen </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anomen -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/anomen.txt b/anomen.txt index 1562dea50bec..e9d8641002ce 100644 --- a/anomen.txt +++ b/anomen.txt @@ -14,7 +14,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync anomen -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing anomen warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following diff --git a/awesome.html b/awesome.html index 836113f14002..6f3fec10cc8a 100644 --- a/awesome.html +++ b/awesome.html @@ -36,49 +36,47 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync awesome </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing awesome </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing awesome + <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>warning: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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> git config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced awesome </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced awesome + <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> * Sync succeeded + <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>$ git log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 awesome </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 32 awesome -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <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/awesome.txt b/awesome.txt index e5e6c1d76925..fc1555d26410 100644 --- a/awesome.txt +++ b/awesome.txt @@ -11,7 +11,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync awesome -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing awesome warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following diff --git a/barnowl.html b/barnowl.html index 5ab4c1314f1d..53eac6559427 100644 --- a/barnowl.html +++ b/barnowl.html @@ -42,49 +42,47 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync barnowl </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing barnowl </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing barnowl + <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>*** synced barnowl </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced barnowl + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 barnowl </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 barnowl -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/barnowl.txt b/barnowl.txt index 1922e61374a2..358000c43e1f 100644 --- a/barnowl.txt +++ b/barnowl.txt @@ -14,7 +14,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync barnowl -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing barnowl 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/beatussum-overlay.html b/beatussum-overlay.html index 39cfac19e92e..ebf38e79d3fb 100644 --- a/beatussum-overlay.html +++ b/beatussum-overlay.html @@ -62,49 +62,47 @@ </pre></td></tr> <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint sync beatussum-overlay </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing beatussum-overlay </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing beatussum-overlay + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>invocation. + <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> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Already up to date. + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced beatussum-overlay </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced beatussum-overlay + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 beatussum-overlay </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 beatussum-overlay -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/beatussum-overlay.txt b/beatussum-overlay.txt index 494ec4543593..4d025fb269ed 100644 --- a/beatussum-overlay.txt +++ b/beatussum-overlay.txt @@ -24,7 +24,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync beatussum-overlay -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing beatussum-overlay warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following @@ -46,49 +46,47 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync bes </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing bes </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing bes + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date. + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced bes </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced bes + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bes </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bes -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> @@ -16,7 +16,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync bes -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing bes 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/bezerker.html b/bezerker.html index f9234389dd67..f3ade2987713 100644 --- a/bezerker.html +++ b/bezerker.html @@ -36,49 +36,47 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync bezerker </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing bezerker </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing bezerker + <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>warning: Pulling without specifying how to reconcile divergent branches is + <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>discouraged. You can squelch this message by running one of the following + <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>commands sometime before your next pull: + <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> + <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.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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> git config pull.ff only # fast-forward only + <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> + <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>You can replace "git config" with "git config --global" to set a default + <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>preference for all repositories. You can also pass --rebase, --no-rebase, + <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>or --ff-only on the command line to override the configured default per + <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>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date. + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced bezerker </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced bezerker + <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> * Sync succeeded + <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>$ git log --format=%ci -1 + <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>$ git show -q --pretty=format:%G? HEAD + <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 bezerker </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 32 bezerker -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <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/bezerker.txt b/bezerker.txt index 01d4829296a9..9028878e4911 100644 --- a/bezerker.txt +++ b/bezerker.txt @@ -11,7 +11,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync bezerker -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing bezerker 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/bibletime.html b/bibletime.html index 8d7124e6fbe7..ea713792eb61 100644 --- a/bibletime.html +++ b/bibletime.html @@ -46,49 +46,47 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync bibletime </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing bibletime </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing bibletime + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date. + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced bibletime </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced bibletime + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bibletime </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bibletime -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/bibletime.txt b/bibletime.txt index 98053de03ec1..b0a1931f197a 100644 --- a/bibletime.txt +++ b/bibletime.txt @@ -16,7 +16,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync bibletime -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing bibletime 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/bircoph.html b/bircoph.html index 744e2915aa0b..2f27974c05c6 100644 --- a/bircoph.html +++ b/bircoph.html @@ -44,51 +44,49 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bircoph </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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>*** syncing bircoph </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing bircoph + <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 </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <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 </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull: + <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> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only + <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> + <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 </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <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, </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <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 </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date. + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bircoph </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced bircoph + <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 32 bircoph </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 32 bircoph -</pre></td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * sys-cluster/torque-3.0.6-r1: failed sourcing ebuild: inherit requires unknown eclass: autotools-utils.eclass + <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * sys-cluster/torque-3.0.6-r1: failed sourcing ebuild: inherit requires unknown eclass: autotools-utils.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> diff --git a/bircoph.txt b/bircoph.txt index 980fa987fb40..cef13f9a27c9 100644 --- a/bircoph.txt +++ b/bircoph.txt @@ -15,7 +15,6 @@ pkgcore 0.11.2 -- extended version info unavailable $ pmaint sync bircoph -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing bircoph 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/fidonet.html b/fidonet.html index 99a7a735d3da..bbf7554ea1a1 100644 --- a/fidonet.html +++ b/fidonet.html @@ -70,7 +70,7 @@ </pre></td></tr> <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>sent 85 bytes received 134 bytes 62.57 bytes/sec + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>sent 85 bytes received 134 bytes 25.76 bytes/sec </pre></td></tr> <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>total size is 32 speedup is 0.15 </pre></td></tr> diff --git a/fidonet.txt b/fidonet.txt index 011aa5c120a8..ac0ad9abe39c 100644 --- a/fidonet.txt +++ b/fidonet.txt @@ -28,7 +28,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 25.76 bytes/sec total size is 32 speedup is 0.15 *** synced fidonet * Sync succeeded diff --git a/gentoo.html b/gentoo.html index 8d3e9e599e0f..4c2a57d23fc4 100644 --- a/gentoo.html +++ b/gentoo.html @@ -70,71 +70,19 @@ </pre></td></tr> <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>From https://anongit.gentoo.org/git/repo/gentoo + <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> 10ac5cc3af3..7a8be263e6d master -> origin/master + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced gentoo </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating 10ac5cc3af3..7a8be263e6d + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> acct-user/github-exporter/github-exporter-0.ebuild | 2 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> app-admin/logrotate/Manifest | 2 - + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../files/logrotate-3.14.0-ignore-hidden.patch | 14 --- -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> app-admin/logrotate/logrotate-3.14.0.ebuild | 101 --------------------- -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> app-admin/logrotate/logrotate-3.17.0.ebuild | 101 --------------------- -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> app-admin/sysklogd/Manifest | 2 - -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> app-admin/sysklogd/sysklogd-2.1.2.ebuild | 84 ----------------- -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> app-admin/sysklogd/sysklogd-2.2.1.ebuild | 84 ----------------- -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> app-arch/ncompress/Manifest | 2 - -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> app-arch/ncompress/ncompress-4.2.4.5.ebuild | 27 ------ -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> app-arch/ncompress/ncompress-4.2.4.6.ebuild | 29 ------ -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> app-arch/sharutils/sharutils-4.15.2-r1.ebuild | 39 -------- -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> net-libs/nodejs/nodejs-14.16.1-r1.ebuild | 9 +- -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> net-libs/nodejs/nodejs-16.0.0-r1.ebuild | 8 +- -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> 14 files changed, 15 insertions(+), 489 deletions(-) -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> delete mode 100644 app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> delete mode 100644 app-admin/logrotate/logrotate-3.14.0.ebuild -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> delete mode 100644 app-admin/logrotate/logrotate-3.17.0.ebuild -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> delete mode 100644 app-admin/sysklogd/sysklogd-2.1.2.ebuild -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> delete mode 100644 app-admin/sysklogd/sysklogd-2.2.1.ebuild -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> delete mode 100644 app-arch/ncompress/ncompress-4.2.4.5.ebuild -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> delete mode 100644 app-arch/ncompress/ncompress-4.2.4.6.ebuild -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> delete mode 100644 app-arch/sharutils/sharutils-4.15.2-r1.ebuild -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced gentoo -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo -</pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/gentoo.txt b/gentoo.txt index d90fa22fe6b6..6cd012a90f2d 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -28,33 +28,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 - 10ac5cc3af3..7a8be263e6d master -> origin/master -Updating 10ac5cc3af3..7a8be263e6d -Fast-forward - acct-user/github-exporter/github-exporter-0.ebuild | 2 +- - app-admin/logrotate/Manifest | 2 - - .../files/logrotate-3.14.0-ignore-hidden.patch | 14 --- - app-admin/logrotate/logrotate-3.14.0.ebuild | 101 --------------------- - app-admin/logrotate/logrotate-3.17.0.ebuild | 101 --------------------- - app-admin/sysklogd/Manifest | 2 - - app-admin/sysklogd/sysklogd-2.1.2.ebuild | 84 ----------------- - app-admin/sysklogd/sysklogd-2.2.1.ebuild | 84 ----------------- - app-arch/ncompress/Manifest | 2 - - app-arch/ncompress/ncompress-4.2.4.5.ebuild | 27 ------ - app-arch/ncompress/ncompress-4.2.4.6.ebuild | 29 ------ - app-arch/sharutils/sharutils-4.15.2-r1.ebuild | 39 -------- - net-libs/nodejs/nodejs-14.16.1-r1.ebuild | 9 +- - net-libs/nodejs/nodejs-16.0.0-r1.ebuild | 8 +- - 14 files changed, 15 insertions(+), 489 deletions(-) - delete mode 100644 app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch - delete mode 100644 app-admin/logrotate/logrotate-3.14.0.ebuild - delete mode 100644 app-admin/logrotate/logrotate-3.17.0.ebuild - delete mode 100644 app-admin/sysklogd/sysklogd-2.1.2.ebuild - delete mode 100644 app-admin/sysklogd/sysklogd-2.2.1.ebuild - delete mode 100644 app-arch/ncompress/ncompress-4.2.4.5.ebuild - delete mode 100644 app-arch/ncompress/ncompress-4.2.4.6.ebuild - delete mode 100644 app-arch/sharutils/sharutils-4.15.2-r1.ebuild +Already up to date. *** synced gentoo * Sync succeeded $ git log --format=%ci -1 diff --git a/index.html b/index.html index 42175ac2156f..cf52d9930f6d 100644 --- a/index.html +++ b/index.html @@ -781,7 +781,7 @@ </table> - <address>Generated based on results from 2021-05-01 23:19:49 UTC</address> + <address>Generated based on results from 2021-05-01 23:34:47 UTC</address> </body> </html>
\ No newline at end of file diff --git a/menelkir.html b/menelkir.html index c57c12be5b50..19d615687b0d 100644 --- a/menelkir.html +++ b/menelkir.html @@ -70,43 +70,19 @@ </pre></td></tr> <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>From https://gitlab.com/menelkir/gentoo-overlay + <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> ba2af537..a296a238 master -> origin/master + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced menelkir </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating ba2af537..a296a238 + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> .../{alephone-20210408.ebuild => alephone-20210408-r1.ebuild} | 5 +++-- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> games-fps/alephone/{alephone-9999.ebuild => alephone-9999-r1.ebuild} | 5 +++-- + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../md5-cache/games-fps/{alephone-20210408 => alephone-20210408-r1} | 4 ++-- -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> metadata/md5-cache/games-fps/{alephone-9999 => alephone-9999-r1} | 4 ++-- -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> 4 files changed, 10 insertions(+), 8 deletions(-) -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> rename games-fps/alephone/{alephone-20210408.ebuild => alephone-20210408-r1.ebuild} (96%) -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> rename games-fps/alephone/{alephone-9999.ebuild => alephone-9999-r1.ebuild} (96%) -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> rename metadata/md5-cache/games-fps/{alephone-20210408 => alephone-20210408-r1} (94%) -</pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> rename metadata/md5-cache/games-fps/{alephone-9999 => alephone-9999-r1} (94%) -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced menelkir -</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 32 menelkir -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> diff --git a/menelkir.txt b/menelkir.txt index 7e21b21c5e31..3274179f8fa6 100644 --- a/menelkir.txt +++ b/menelkir.txt @@ -28,19 +28,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://gitlab.com/menelkir/gentoo-overlay - ba2af537..a296a238 master -> origin/master -Updating ba2af537..a296a238 -Fast-forward - .../{alephone-20210408.ebuild => alephone-20210408-r1.ebuild} | 5 +++-- - games-fps/alephone/{alephone-9999.ebuild => alephone-9999-r1.ebuild} | 5 +++-- - .../md5-cache/games-fps/{alephone-20210408 => alephone-20210408-r1} | 4 ++-- - metadata/md5-cache/games-fps/{alephone-9999 => alephone-9999-r1} | 4 ++-- - 4 files changed, 10 insertions(+), 8 deletions(-) - rename games-fps/alephone/{alephone-20210408.ebuild => alephone-20210408-r1.ebuild} (96%) - rename games-fps/alephone/{alephone-9999.ebuild => alephone-9999-r1.ebuild} (96%) - rename metadata/md5-cache/games-fps/{alephone-20210408 => alephone-20210408-r1} (94%) - rename metadata/md5-cache/games-fps/{alephone-9999 => alephone-9999-r1} (94%) +Already up to date. *** synced menelkir * Sync succeeded $ git log --format=%ci -1 diff --git a/poly-c.html b/poly-c.html index 6f071de1d2ac..507699e5d723 100644 --- a/poly-c.html +++ b/poly-c.html @@ -118,7 +118,7 @@ </pre></td></tr> <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 85 bytes received 134 bytes 62.57 bytes/sec </pre></td></tr> <tr class="" id="l56"><td><a href="#l56"><span>56</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 5d4065ab968d..be97e4845237 100644 --- a/poly-c.txt +++ b/poly-c.txt @@ -52,7 +52,7 @@ File list transfer time: 0.000 seconds Total bytes sent: 85 Total bytes received: 134 -sent 85 bytes received 134 bytes 87.60 bytes/sec +sent 85 bytes received 134 bytes 62.57 bytes/sec total size is 32 speedup is 0.15 *** synced poly-c * Sync succeeded diff --git a/swegener.html b/swegener.html index fbe932f36cd4..05017d2af7e5 100644 --- a/swegener.html +++ b/swegener.html @@ -100,15 +100,15 @@ </pre></td></tr> <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes sent: 139 + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes sent: 143 </pre></td></tr> <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total bytes received: 5.09K </pre></td></tr> <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 139 bytes received 5.09K bytes 1.49K bytes/sec + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 143 bytes received 5.09K bytes 2.09K bytes/sec </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 107.84K speedup is 20.62 + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 107.84K speedup is 20.60 </pre></td></tr> <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced swegener </pre></td></tr> diff --git a/swegener.txt b/swegener.txt index 62a48b919c4a..55c5a4617b83 100644 --- a/swegener.txt +++ b/swegener.txt @@ -43,11 +43,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: 139 +Total bytes sent: 143 Total bytes received: 5.09K -sent 139 bytes received 5.09K bytes 1.49K bytes/sec -total size is 107.84K speedup is 20.62 +sent 143 bytes received 5.09K bytes 2.09K bytes/sec +total size is 107.84K speedup is 20.60 *** synced swegener * Sync succeeded $ stat --format=%y . diff --git a/zugaina.html b/zugaina.html index 9e5b06b6116e..3e5d22848cbf 100644 --- a/zugaina.html +++ b/zugaina.html @@ -60,13 +60,13 @@ </pre></td></tr> <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list transfer time: 0.000 seconds </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 486 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes sent: 482 </pre></td></tr> <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes received: 44.27K </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>sent 486 bytes received 44.27K bytes 12.79K bytes/sec + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>sent 482 bytes received 44.27K bytes 12.79K bytes/sec </pre></td></tr> <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>total size is 2.01M speedup is 44.93 </pre></td></tr> diff --git a/zugaina.txt b/zugaina.txt index 182fd2c1a63d..90e735705174 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -23,10 +23,10 @@ Matched data: 0 bytes File list size: 40.11K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 486 +Total bytes sent: 482 Total bytes received: 44.27K -sent 486 bytes received 44.27K bytes 12.79K bytes/sec +sent 482 bytes received 44.27K bytes 12.79K bytes/sec total size is 2.01M speedup is 44.93 *** synced zugaina * Sync succeeded |