summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-11-20 17:05:17 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-11-20 17:05:17 +0000
commitd7f328656ae7932de1ca24dc281e632803d8a943 (patch)
treec4219a0634fb173d82645830e88a8daeb7b3cef6 /guru.html
parent2020-11-20T16:30:01Z (diff)
downloadrepos-d7f328656ae7932de1ca24dc281e632803d8a943.tar.gz
repos-d7f328656ae7932de1ca24dc281e632803d8a943.tar.bz2
repos-d7f328656ae7932de1ca24dc281e632803d8a943.zip
2020-11-20T17:00:01Z
Diffstat (limited to 'guru.html')
-rw-r--r--guru.html114
1 files changed, 22 insertions, 92 deletions
diff --git a/guru.html b/guru.html
index a5db0fd1c46..714eb3f44be 100644
--- a/guru.html
+++ b/guru.html
@@ -36,119 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync guru
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', 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="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/proj/guru
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> c3f0b79..d80dda2 master -&gt; origin/master
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 829b51d..d80dda2 dev -&gt; origin/dev
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing guru
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating c3f0b79..d80dda2
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced guru
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-office/pyspread/Manifest | 2 +-
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> ...ead-1.99.2-r1.ebuild =&gt; pyspread-1.99.5.ebuild} | 0
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-python/backrefs/Manifest | 2 +-
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-python/backrefs/backrefs-4.3.0.ebuild | 34 ------------
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-python/backrefs/backrefs-4.5.0.ebuild | 45 +++++++++++++++
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-python/jupyter-sphinx/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> ...nx-0.2.4.ebuild =&gt; jupyter-sphinx-0.3.2.ebuild} | 4 +-
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-python/markdown-include/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> ...-0.5.1.ebuild =&gt; markdown-include-0.6.0.ebuild} | 2 +-
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-python/mkdocs-material/Manifest | 3 +-
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> .../mkdocs-material/mkdocs-material-4.6.3.ebuild | 30 ----------
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> ...l-6.1.0.ebuild =&gt; mkdocs-material-6.1.5.ebuild} | 0
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-python/timeout-decorator/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> ...0.4.1.ebuild =&gt; timeout-decorator-0.5.0.ebuild} | 2 +-
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> games-action/minecraft-launcher/Manifest | 1 +
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../minecraft-launcher-2.2.548_beta.ebuild | 64 ++++++++++++++++++++++
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> games-action/technic-launcher/Manifest | 2 +-
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> ...-4.603.ebuild =&gt; technic-launcher-4.607.ebuild} | 0
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> media-libs/amdvlk/Manifest | 8 +--
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> ...dvlk-2020.4.4.ebuild =&gt; amdvlk-2020.4.5.ebuild} | 24 ++------
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> 20 files changed, 131 insertions(+), 98 deletions(-)
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> rename app-office/pyspread/{pyspread-1.99.2-r1.ebuild =&gt; pyspread-1.99.5.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> delete mode 100644 dev-python/backrefs/backrefs-4.3.0.ebuild
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 dev-python/backrefs/backrefs-4.5.0.ebuild
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> rename dev-python/jupyter-sphinx/{jupyter-sphinx-0.2.4.ebuild =&gt; jupyter-sphinx-0.3.2.ebuild} (85%)
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> rename dev-python/markdown-include/{markdown-include-0.5.1.ebuild =&gt; markdown-include-0.6.0.ebuild} (92%)
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> delete mode 100644 dev-python/mkdocs-material/mkdocs-material-4.6.3.ebuild
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> rename dev-python/mkdocs-material/{mkdocs-material-6.1.0.ebuild =&gt; mkdocs-material-6.1.5.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> rename dev-python/timeout-decorator/{timeout-decorator-0.4.1.ebuild =&gt; timeout-decorator-0.5.0.ebuild} (91%)
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> create mode 100644 games-action/minecraft-launcher/minecraft-launcher-2.2.548_beta.ebuild
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> rename games-action/technic-launcher/{technic-launcher-4.603.ebuild =&gt; technic-launcher-4.607.ebuild} (100%)
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> rename media-libs/amdvlk/{amdvlk-2020.4.4.ebuild =&gt; amdvlk-2020.4.5.ebuild} (87%)
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>*** syncing guru
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>*** synced guru
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>