diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-11-09 14:07:08 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-11-09 14:07:08 +0000 |
commit | 3cfc0ecadc98ae719c9f1c8e8a22765d97baabaf (patch) | |
tree | ea18f21a850b954fb59c0dfa7d2389bbd7fc2a19 /asahi.html | |
parent | 2024-11-09T13:45:01Z (diff) | |
download | repos-3cfc0ecadc98ae719c9f1c8e8a22765d97baabaf.tar.gz repos-3cfc0ecadc98ae719c9f1c8e8a22765d97baabaf.tar.bz2 repos-3cfc0ecadc98ae719c9f1c8e8a22765d97baabaf.zip |
2024-11-09T14:00:00Z
Diffstat (limited to 'asahi.html')
-rw-r--r-- | asahi.html | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/asahi.html b/asahi.html index 6e53af83c546..ae0e4cef5366 100644 --- a/asahi.html +++ b/asahi.html @@ -46,39 +46,57 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/chadmed/asahi-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> 2d6854f..84a9dcf main -> origin/main + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + 84a9dcf...b983ba9 main -> origin/main (forced update) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 2d6854f..84a9dcf + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Fast-forward + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> app-emulation/muvm/Manifest | 1 + + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: your next pull: </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> app-emulation/muvm/muvm-0.1.2-r1.ebuild | 2 +- + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> .../muvm/{muvm-0.1.2.ebuild => muvm-0.1.3.ebuild} | 1 + + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase false # merge </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> media-libs/asahi-audio/Manifest | 1 + + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> media-libs/asahi-audio/asahi-audio-2.4.ebuild | 28 ++++++++++++++++++++++ + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: 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> 5 files changed, 32 insertions(+), 1 deletion(-) + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> rename app-emulation/muvm/{muvm-0.1.2.ebuild => muvm-0.1.3.ebuild} (99%) + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: 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> create mode 100644 media-libs/asahi-audio/asahi-audio-2.4.ebuild + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: 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>*** synced asahi + <tr class="" id="l30"><td><a href="#l30"><span>30</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="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>hint: invocation. </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>fatal: Need to specify how to reconcile divergent branches. </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>!!! failed syncing asahi </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 asahi + <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync failed with 1 +</pre></td><td>[FATAL]</td></tr> + <tr class="" id="l35"><td><a href="#l35"><span>35</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> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync asahi +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing asahi +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/asahi'... +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced asahi +</pre></td></tr> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded after re-adding +</pre></td></tr> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 asahi +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |