diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-19 16:03:49 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-19 16:03:49 +0000 |
| commit | f976e36da87d9a946b81b21e1cf4e9fd336e08f4 (patch) | |
| tree | 56cbd283f00f1fb9d84d8b7a0230c778dad50ffb /SarahMiaOverlay.html | |
| parent | 2023-05-19T15:45:01Z (diff) | |
| download | repos-f976e36da87d9a946b81b21e1cf4e9fd336e08f4.tar.gz repos-f976e36da87d9a946b81b21e1cf4e9fd336e08f4.tar.bz2 repos-f976e36da87d9a946b81b21e1cf4e9fd336e08f4.zip | |
2023-05-19T16:00:01Z
Diffstat (limited to 'SarahMiaOverlay.html')
| -rw-r--r-- | SarahMiaOverlay.html | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/SarahMiaOverlay.html b/SarahMiaOverlay.html index 0a2fcecfebd6..9200059bbe00 100644 --- a/SarahMiaOverlay.html +++ b/SarahMiaOverlay.html @@ -50,67 +50,63 @@ </pre></td></tr> <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>From https://gitlab.com/SarahMia/sarahmiaoverlay </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> 526149d..1a8009f master -> origin/master + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> + 1a8009f...20ee3ec master -> origin/master (forced update) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Updating 526149d..1a8009f + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Fast-forward + <tr class="" id="l23"><td><a href="#l23"><span>23</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="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> CHANGELOG.md | 20 ++ + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: your next pull: </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> README.md | 2 +- + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> gnome-extra/budgie-analogue-clock-applet/Manifest | 4 +- + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: git config pull.rebase false # merge </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> .../budgie-analogue-clock-applet-1.3.0.ebuild | 59 ------ + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> .../budgie-analogue-clock-applet-2.0.ebuild | 2 +- + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> gnome-extra/budgie-desktop/Manifest | 6 +- + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> .../budgie-desktop/budgie-desktop-10.7.1.ebuild | 2 +- + <tr class="" id="l30"><td><a href="#l30"><span>30</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="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> ...op-10.7.ebuild => budgie-desktop-10.7.2.ebuild} | 4 +- + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> gnome-extra/budgie-extras/Manifest | 6 +- + <tr class="" id="l32"><td><a href="#l32"><span>32</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="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../budgie-extras/budgie-extras-1.5.0.ebuild | 96 --------- + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>hint: invocation. </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> .../budgie-extras/budgie-extras-1.6.0.ebuild | 2 +- + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches. </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> .../budgie-extras/budgie-extras-9999.ebuild | 221 ++++++++++++++++++--- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>!!! failed syncing SarahMiaOverlay </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> gnome-extra/budgie-meta/Manifest | 4 +- + <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync failed with 1 +</pre></td><td>[FATAL]</td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Will try to re-create </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> gnome-extra/budgie-meta/budgie-meta-10.7.1.ebuild | 2 +- + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SarahMiaOverlay </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> ...-meta-10.7.ebuild => budgie-meta-10.7.2.ebuild} | 9 +- + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> 15 files changed, 233 insertions(+), 206 deletions(-) + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing SarahMiaOverlay </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> delete mode 100644 gnome-extra/budgie-analogue-clock-applet/budgie-analogue-clock-applet-1.3.0.ebuild + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/SarahMiaOverlay'... </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> rename gnome-extra/budgie-desktop/{budgie-desktop-10.7.ebuild => budgie-desktop-10.7.2.ebuild} (96%) + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced SarahMiaOverlay </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> delete mode 100644 gnome-extra/budgie-extras/budgie-extras-1.5.0.ebuild + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded after re-adding </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> rename gnome-extra/budgie-meta/{budgie-meta-10.7.ebuild => budgie-meta-10.7.2.ebuild} (80%) + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced SarahMiaOverlay + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 SarahMiaOverlay </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/repos/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/repos/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 SarahMiaOverlay -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/repos/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/repos/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |