diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-04 00:52:41 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-04 00:52:41 +0000 |
| commit | e6dc5c519d408ed7a35c088b9b2236a4434db744 (patch) | |
| tree | ad8527b0f131fd7a02e962d6c4e406c81a793067 /tatsh-overlay.html | |
| parent | 2024-12-04T00:30:00Z (diff) | |
| download | repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.tar.gz repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.tar.bz2 repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.zip | |
2024-12-04T00:45:00Z
Diffstat (limited to 'tatsh-overlay.html')
| -rw-r--r-- | tatsh-overlay.html | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/tatsh-overlay.html b/tatsh-overlay.html index 55b2ffeed720..f97f8a0f9df2 100644 --- a/tatsh-overlay.html +++ b/tatsh-overlay.html @@ -46,57 +46,41 @@ </pre></td></tr> <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/Tatsh/tatsh-overlay </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + ab005c0c...0c80a3bc master -> origin/master (forced update) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> 0c80a3bc..f502885c master -> origin/master </pre></td></tr> - <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. + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating 0c80a3bc..f502885c </pre></td></tr> - <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 + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: your next pull: + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> dev-python/curl-cffi/Manifest | 4 +++ </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> dev-python/curl-cffi/curl-cffi-0.7.3.ebuild | 24 +++++++++++++++ </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.rebase false # merge + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> .../files/curl-cffi-0001-system-libs.patch | 35 ++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.rebase true # rebase + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> dev-python/curl-cffi/metadata.xml | 11 +++++++ </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> 4 files changed, 74 insertions(+) </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> create mode 100644 dev-python/curl-cffi/Manifest </pre></td></tr> - <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 + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> create mode 100644 dev-python/curl-cffi/curl-cffi-0.7.3.ebuild </pre></td></tr> - <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, + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> create mode 100644 dev-python/curl-cffi/files/curl-cffi-0001-system-libs.patch </pre></td></tr> - <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 + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> create mode 100644 dev-python/curl-cffi/metadata.xml </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: invocation. + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced tatsh-overlay </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches. + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>!!! failed syncing tatsh-overlay + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <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 + <tr class="" id="l34"><td><a href="#l34"><span>34</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>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing tatsh-overlay -</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/tatsh-overlay'... -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced tatsh-overlay -</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 tatsh-overlay -</pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |