summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2024-08-20 13:18:50 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2024-08-20 13:18:50 +0000
commitd60dc52aea1b52acf4b1deb7ac97828a962eeb0f (patch)
tree148117e7898edf7376f6ed39f9e5816317c78108 /AlexandreFournier.html
parent2024-08-20T13:00:00Z (diff)
downloadrepos-d60dc52aea1b52acf4b1deb7ac97828a962eeb0f.tar.gz
repos-d60dc52aea1b52acf4b1deb7ac97828a962eeb0f.tar.bz2
repos-d60dc52aea1b52acf4b1deb7ac97828a962eeb0f.zip
2024-08-20T13:15:00Z
Diffstat (limited to 'AlexandreFournier.html')
-rw-r--r--AlexandreFournier.html56
1 files changed, 48 insertions, 8 deletions
diff --git a/AlexandreFournier.html b/AlexandreFournier.html
index 801e71232b64..9ff1d7d52f8f 100644
--- a/AlexandreFournier.html
+++ b/AlexandreFournier.html
@@ -44,21 +44,61 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AlexandreFournier
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>From https://github.com/AlexandreFournier/gentoo-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced AlexandreFournier
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + 6c64f19...ae403c7 master -&gt; origin/master (forced update)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+ <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>$ git log --format=%ci -1
+ <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>$ git show -q --pretty=format:%G? HEAD
+ <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>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 AlexandreFournier
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint:
</pre></td></tr>
- <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * net-wireless/bully-1.1_p20170926: failed sourcing ebuild: git-r3: EAPI 6 not supported, (git-r3.eclass, line 30: called die)
+ <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>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>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>hint:
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</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,
+</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
+</pre></td></tr>
+ <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>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>!!! failed syncing AlexandreFournier
+</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
+</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 AlexandreFournier
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing AlexandreFournier
+</pre></td></tr>
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;...
+</pre></td></tr>
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced AlexandreFournier
+</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 AlexandreFournier
+</pre></td></tr>
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-wireless/bully-1.1_p20170926: 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="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>