diff options
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 86 |
1 files changed, 58 insertions, 28 deletions
diff --git a/gentoo.html b/gentoo.html index a41cca6bfad4..386f61fe788d 100644 --- a/gentoo.html +++ b/gentoo.html @@ -38,61 +38,91 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo </pre></td></tr> - <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 + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', 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="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', 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="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull: + <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 </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> + <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 </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <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 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <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, + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <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 + <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 </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation. + <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, </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> + <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 </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 22559fe330c..6f6e3b13ea9 master -> origin/master + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 22559fe330c..6f6e3b13ea9 + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </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> 6f6e3b13ea9..5ee15fdd52a master -> origin/master </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> dev-python/xarray/Manifest | 1 + + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating 6f6e3b13ea9..5ee15fdd52a </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-python/xarray/xarray-0.16.2.ebuild | 37 ++++++++++++++++++++++++++++++++++ + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> 2 files changed, 38 insertions(+) + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-games/cegui/cegui-0.8.7-r100.ebuild | 126 +++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> create mode 100644 dev-python/xarray/xarray-0.16.2.ebuild + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../toluapp/toluapp-1.0.93_p20190513-r100.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced gentoo + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> games-rpg/kqlives/kqlives-0.99-r100.ebuild | 58 ++++++++++ </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../files/sumwars-0.5.8-cmake_lua_version.patch | 11 ++ </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> games-rpg/sumwars/sumwars-0.5.8-r100.ebuild | 101 +++++++++++++++++ </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> media-libs/tremor/tremor-0_pre20130223-r2.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild | 2 +- +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> net-wireless/wavemon/wavemon-0.7.6.ebuild | 4 +- +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> profiles/package.mask | 3 + +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> sci-libs/gsl/gsl-1.16.ebuild | 2 +- +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> 12 files changed, 307 insertions(+), 8 deletions(-) +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> create mode 100644 dev-games/cegui/cegui-0.8.7-r100.ebuild +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> create mode 100644 games-rpg/kqlives/kqlives-0.99-r100.ebuild +</pre></td></tr> + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> create mode 100644 games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch +</pre></td></tr> + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> create mode 100644 games-rpg/sumwars/sumwars-0.5.8-r100.ebuild +</pre></td></tr> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing gentoo +</pre></td></tr> + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced gentoo +</pre></td></tr> + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |