summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-10-03 01:35:58 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-10-03 01:35:58 +0000
commitba31eee127a766b46a83322b7b6b20114740824a (patch)
tree89906bc72da2d2dec5bc5039e6ba5d33f533149c /buzden.html
parent2021-10-03T01:00:01Z (diff)
downloadrepos-ba31eee127a766b46a83322b7b6b20114740824a.tar.gz
repos-ba31eee127a766b46a83322b7b6b20114740824a.tar.bz2
repos-ba31eee127a766b46a83322b7b6b20114740824a.zip
2021-10-03T01:30:02Z
Diffstat (limited to 'buzden.html')
-rw-r--r--buzden.html44
1 files changed, 20 insertions, 24 deletions
diff --git a/buzden.html b/buzden.html
index fe2e709026b9..0182400c7d20 100644
--- a/buzden.html
+++ b/buzden.html
@@ -44,49 +44,45 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync buzden
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing buzden
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>ERROR:pkgcore:&#x27;eapi&#x27;: empty file
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: 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>*** syncing buzden
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: 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>hint: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: 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>hint:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: commands sometime before your next pull:
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: 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>hint:
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: 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>hint: git config pull.rebase true # rebase
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint:
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint:
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: 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>hint: You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: 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>hint: 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>hint: invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: 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>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>hint: invocation.
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced buzden
</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> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced buzden
+ <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> * Sync succeeded
+ <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 log --format=%ci -1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 buzden
</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
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 buzden
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</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>