diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:38:02 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:38:02 +0000 |
commit | 124ab3295c1a2c0f539a69c07bce7b281ac0d957 (patch) | |
tree | 2c198428b265a6412edfc3a6c12852ec0f7a3ab6 /SwordArMor.html | |
parent | 2024-09-18T18:00:00Z (diff) | |
download | repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.tar.gz repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.tar.bz2 repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.zip |
2024-09-18T18:30:00Z
Diffstat (limited to 'SwordArMor.html')
-rw-r--r-- | SwordArMor.html | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/SwordArMor.html b/SwordArMor.html index afa11257e0fb..b59e597f444f 100644 --- a/SwordArMor.html +++ b/SwordArMor.html @@ -44,65 +44,45 @@ </pre></td></tr> <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + 8e7694a...553a1bf master -> origin/master (forced update) + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> 553a1bf..8c69a4a master -> origin/master </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Updating 553a1bf..8c69a4a </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: your next pull: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> metadata/md5-cache/net-im/mautrix-signal-0.7.0 | 2 +- </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> .../net-im/{mautrix-signal-0.6.3 => mautrix-signal-0.7.1} | 8 ++++---- </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: git config pull.rebase false # merge + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> net-im/mautrix-signal/Manifest | 4 ++-- </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase true # rebase + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> .../{mautrix-signal-0.6.3.ebuild => mautrix-signal-0.7.1.ebuild} | 9 +++------ </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> 4 files changed, 10 insertions(+), 13 deletions(-) </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> rename metadata/md5-cache/net-im/{mautrix-signal-0.6.3 => mautrix-signal-0.7.1} (56%) </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: 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> rename net-im/mautrix-signal/{mautrix-signal-0.6.3.ebuild => mautrix-signal-0.7.1.ebuild} (88%) </pre></td></tr> - <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, + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced SwordArMor </pre></td></tr> - <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 + <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>hint: invocation. + <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>fatal: Need to specify how to reconcile divergent branches. + <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>!!! failed syncing SwordArMor + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 SwordArMor </pre></td></tr> - <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync failed with 1 + <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-gfx/libsane-dsseries-bin-1.0.5_p1: failed sourcing ebuild: unpacker: EAPI 6 not supported, (unpacker.eclass, line 20: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing SwordArMor -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced SwordArMor -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded after re-adding -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1 -</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 -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 SwordArMor -</pre></td></tr> - <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-gfx/libsane-dsseries-bin-1.0.5_p1: failed sourcing ebuild: unpacker: EAPI 6 not supported, (unpacker.eclass, line 20: called die) -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-misc/urlview-0.9_p21: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-misc/urlview-0.9_p21: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * net-nds/apachedirectorystudio-2.0.0.20200411: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-nds/apachedirectorystudio-2.0.0.20200411: failed sourcing ebuild: inherit requires unknown eclass: eutils.eclass </pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * x11-plugins/purple-discord-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line 30: called die) + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-plugins/purple-discord-9999: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line 30: called die) </pre></td><td>[FATAL]</td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1 </pre></td></tr> </table> |