summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-08-21 11:06:29 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-08-21 11:06:29 +0000
commit574febc6b40e729059746d9998c2c3a32621f030 (patch)
tree25995d35cd8eac13bd51480e3702d331180e1143 /shnurise.html
parent2020-08-21T10:30:01Z (diff)
downloadrepos-574febc6b40e729059746d9998c2c3a32621f030.tar.gz
repos-574febc6b40e729059746d9998c2c3a32621f030.tar.bz2
repos-574febc6b40e729059746d9998c2c3a32621f030.zip
2020-08-21T10:59:14Z
Diffstat (limited to 'shnurise.html')
-rw-r--r--shnurise.html78
1 files changed, 40 insertions, 38 deletions
diff --git a/shnurise.html b/shnurise.html
index c90c7542d734..e8aa2194991e 100644
--- a/shnurise.html
+++ b/shnurise.html
@@ -44,81 +44,83 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync shnurise
</pre></td></tr>
- <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
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:chaoslab repo at '/var/lib/repo-mirror-ci/sync/chaoslab', 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="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</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>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <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> git config pull.rebase true # rebase
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <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
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <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,
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
- <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
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing shnurise
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced shnurise
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing shnurise
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced shnurise
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 shnurise
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 shnurise
+</pre></td></tr>
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-dotnet/ssh-net-2016.1.0_p33-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-dotnet/ssh-net-2016.1.0_p33-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * www-servers/xsp-4.6-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * www-servers/xsp-4.6-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>