diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-08 03:04:56 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-08 03:04:56 +0000 |
| commit | 99c92ecbd26ce5da89c335316a10f9fc6b1d59d1 (patch) | |
| tree | e3eaa6594a2210e18c5d862e174035218afecf82 /jorgicio.html | |
| parent | 2021-01-08T02:30:01Z (diff) | |
| download | repos-99c92ecbd26ce5da89c335316a10f9fc6b1d59d1.tar.gz repos-99c92ecbd26ce5da89c335316a10f9fc6b1d59d1.tar.bz2 repos-99c92ecbd26ce5da89c335316a10f9fc6b1d59d1.zip | |
2021-01-08T03:00:01Z
Diffstat (limited to 'jorgicio.html')
| -rw-r--r-- | jorgicio.html | 110 |
1 files changed, 77 insertions, 33 deletions
diff --git a/jorgicio.html b/jorgicio.html index ea73d07a0d72..27e83a317534 100644 --- a/jorgicio.html +++ b/jorgicio.html @@ -42,59 +42,103 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync jorgicio </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', 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="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date. + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing jorgicio + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>From https://github.com/jorgicio/jorgicio-gentoo </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced jorgicio + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 881082aa..cacff27e main -> origin/main </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating 881082aa..cacff27e </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> games-puzzle/2048-qt/2048-qt-0.1.6.ebuild | 4 +- </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> games-puzzle/2048-qt/2048-qt-9999.ebuild | 4 +- </pre></td></tr> - <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * games-puzzle/2048-qt-0.1.6: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-puzzle/2048-qt-9999: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-video/minitube-2.9: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-video/minitube-9999: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-video/olive-0.1.1: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-video/olive-0.1.2: failed sourcing ebuild: EAPI=6 is not supported -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1 + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> games-puzzle/2048-qt/Manifest | 4 +- +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> media-video/flowblade/Manifest | 7 +- +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> .../files/flowblade-2.6-install-dir-fix.patch | 13 ++ +</pre></td></tr> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> ...-2.4.0.1.ebuild => flowblade-2.4.0.1-r1.ebuild} | 4 +- +</pre></td></tr> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> media-video/flowblade/flowblade-2.6.3.ebuild | 67 +++++++ +</pre></td></tr> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> ...wblade-9999.ebuild => flowblade-9999-r1.ebuild} | 4 +- +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> media-video/minitube/Manifest | 4 +- +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> media-video/minitube/minitube-2.9.ebuild | 4 +- +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> media-video/minitube/minitube-9999.ebuild | 4 +- +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> media-video/olive/Manifest | 4 +- +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> media-video/olive/olive-0.1.1.ebuild | 4 +- +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> media-video/olive/olive-0.1.2.ebuild | 4 +- +</pre></td></tr> + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> sys-apps/ripgrep-all/Manifest | 117 ++++++++++++ +</pre></td></tr> + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> sys-apps/ripgrep-all/ripgrep-all-0.9.3-r1.ebuild | 202 +++++++++++++++++++++ +</pre></td></tr> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild | 198 ++++++++++++++++++++ +</pre></td></tr> + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> 17 files changed, 624 insertions(+), 24 deletions(-) +</pre></td></tr> + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100644 media-video/flowblade/files/flowblade-2.6-install-dir-fix.patch +</pre></td></tr> + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> rename media-video/flowblade/{flowblade-2.4.0.1.ebuild => flowblade-2.4.0.1-r1.ebuild} (96%) +</pre></td></tr> + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 media-video/flowblade/flowblade-2.6.3.ebuild +</pre></td></tr> + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> rename media-video/flowblade/{flowblade-9999.ebuild => flowblade-9999-r1.ebuild} (96%) +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> create mode 100644 sys-apps/ripgrep-all/ripgrep-all-0.9.3-r1.ebuild +</pre></td></tr> + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> create mode 100644 sys-apps/ripgrep-all/ripgrep-all-0.9.6.ebuild +</pre></td></tr> + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing jorgicio +</pre></td></tr> + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced jorgicio +</pre></td></tr> + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio +</pre></td></tr> + <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |