diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-02 23:16:42 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-02 23:16:42 +0000 |
| commit | d9e2099be59008ff2081bb8abc746f9745456647 (patch) | |
| tree | e4d98bc39b9d2a4dc5ccf3b871dc242a939120ca /Case_Of.html | |
| parent | 2022-11-02T23:00:01Z (diff) | |
| download | repos-d9e2099be59008ff2081bb8abc746f9745456647.tar.gz repos-d9e2099be59008ff2081bb8abc746f9745456647.tar.bz2 repos-d9e2099be59008ff2081bb8abc746f9745456647.zip | |
2022-11-02T23:15:01Z
Diffstat (limited to 'Case_Of.html')
| -rw-r--r-- | Case_Of.html | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/Case_Of.html b/Case_Of.html index f7bbb18cd902..71a455b6e28c 100644 --- a/Case_Of.html +++ b/Case_Of.html @@ -46,51 +46,61 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://codeberg.org/Case_Of/gentoo-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> 632cd8e..67baacb master -> origin/master + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + 67baacb...360183c master -> origin/master (forced update) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 632cd8e..67baacb + <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> dev-util/cpp-utilities/Manifest | 2 +- + <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> .../{cpp-utilities-5.19.0.ebuild => cpp-utilities-5.20.0.ebuild} | 0 + <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> dev-util/qtforkawesome/Manifest | 2 +- + <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> .../{qtforkawesome-0.0.4.ebuild => qtforkawesome-0.1.0.ebuild} | 0 + <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> dev-util/qtutilities/Manifest | 2 +- + <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> .../qtutilities/{qtutilities-6.9.0.ebuild => qtutilities-6.10.0.ebuild} | 0 + <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> x11-plugins/syncthingtray/Manifest | 2 +- + <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> .../{syncthingtray-1.2.4.ebuild => syncthingtray-1.3.0.ebuild} | 0 + <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> 8 files changed, 4 insertions(+), 4 deletions(-) + <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> rename dev-util/cpp-utilities/{cpp-utilities-5.19.0.ebuild => cpp-utilities-5.20.0.ebuild} (100%) + <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> rename dev-util/qtforkawesome/{qtforkawesome-0.0.4.ebuild => qtforkawesome-0.1.0.ebuild} (100%) + <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> rename dev-util/qtutilities/{qtutilities-6.9.0.ebuild => qtutilities-6.10.0.ebuild} (100%) + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>!!! failed syncing Case_Of </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> rename x11-plugins/syncthingtray/{syncthingtray-1.2.4.ebuild => syncthingtray-1.3.0.ebuild} (100%) + <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>*** synced Case_Of + <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 Case_Of </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. </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="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing Case_Of </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="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 Case_Of + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced Case_Of </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. + <tr class="" id="l41"><td><a href="#l41"><span>41</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> * Cache regenerated successfully + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 Case_Of +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |