summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-10-04 01:06:54 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-10-04 01:06:54 +0000
commit753a1214c29ca664403e0aa05ed0406658302240 (patch)
treec2e7d3de0f3342e5f220108449e53a588577996e /gentoo.html
parent2020-10-04T00:30:01Z (diff)
downloadrepos-753a1214c29ca664403e0aa05ed0406658302240.tar.gz
repos-753a1214c29ca664403e0aa05ed0406658302240.tar.bz2
repos-753a1214c29ca664403e0aa05ed0406658302240.zip
2020-10-04T01:00:01Z
Diffstat (limited to 'gentoo.html')
-rw-r--r--gentoo.html68
1 files changed, 40 insertions, 28 deletions
diff --git a/gentoo.html b/gentoo.html
index 381a0bc7631..a28eccf03c5 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -38,63 +38,75 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', 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>WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', 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="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:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', 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:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', 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="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>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>
+ <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> git config pull.rebase false # merge (the default strategy)
+ <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> git config pull.rebase true # rebase
+ <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> 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 false # merge (the default strategy)
</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 true # rebase
</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> 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>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>
</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>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>invocation.
+ <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>
+ <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>From https://anongit.gentoo.org/git/repo/gentoo
+ <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> 2d54445d439..497ab351b26 master -&gt; origin/master
+ <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>Updating 2d54445d439..497ab351b26
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> 497ab351b26..772ad523dee master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 2 +-
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Updating 497ab351b26..772ad523dee
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> games-simulation/openrct2/openrct2-0.3.1.ebuild | 2 +-
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Fast-forward
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> 2 files changed, 2 insertions(+), 2 deletions(-)
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r2.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing gentoo
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r2.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced gentoo
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> app-office/libreoffice-l10n/libreoffice-l10n-6.4.6.2.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> app-text/libnumbertext/libnumbertext-1.0.6.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> app-text/libwps/libwps-0.4.12.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> 6 files changed, 6 insertions(+), 6 deletions(-)
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** 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
</pre></td></tr>
</table>