diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-27 01:05:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-27 01:05:11 +0000 |
| commit | 72edff9cf11233ebe210fcd6922abb0970c05e7d (patch) | |
| tree | f4a7ac9c57cae2027c756d5f7f668601a6e99477 /gentoo.html | |
| parent | 2020-11-27T00:30:01Z (diff) | |
| download | repos-72edff9cf11233ebe210fcd6922abb0970c05e7d.tar.gz repos-72edff9cf11233ebe210fcd6922abb0970c05e7d.tar.bz2 repos-72edff9cf11233ebe210fcd6922abb0970c05e7d.zip | |
2020-11-27T01:00:01Z
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 110 |
1 files changed, 66 insertions, 44 deletions
diff --git a/gentoo.html b/gentoo.html index 7d125f92ad1f..063cfc7f68de 100644 --- a/gentoo.html +++ b/gentoo.html @@ -38,93 +38,115 @@ </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:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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>WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <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>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>commands sometime before your next pull: </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> </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> 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> + <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> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <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.ff only # fast-forward only + <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> + <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>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>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>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>invocation. </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> </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>From https://anongit.gentoo.org/git/repo/gentoo </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> 0733fc1b77b..2e53b60da81 master -> origin/master </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating 0733fc1b77b..2e53b60da81 </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> 918d377977f..0733fc1b77b master -> origin/master + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating 918d377977f..0733fc1b77b + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> net-analyzer/braa/braa-0.82.ebuild | 24 ------------- </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Fast-forward + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> net-analyzer/ethloop/ethloop-10-r3.ebuild | 29 --------------- </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> net-analyzer/arpoison/arpoison-0.7.ebuild | 4 ++-- + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> net-analyzer/hunt/Manifest | 1 - </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-analyzer/bigeye/bigeye-0.3-r4.ebuild | 2 +- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-analyzer/hunt/hunt-1.5-r1.ebuild | 33 ----------------- </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> net-analyzer/braa/braa-0.82-r1.ebuild | 2 +- + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> net-analyzer/hunt/hunt-1.5-r3.ebuild | 32 ----------------- </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild | 2 +- + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> net-analyzer/ibmonitor/ibmonitor-1.4.ebuild | 21 ----------- </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> net-analyzer/ethloop/ethloop-10-r4.ebuild | 2 +- + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> net-analyzer/ike-scan/Manifest | 1 - </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> net-analyzer/firewalk/firewalk-5.0-r2.ebuild | 2 +- + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild | 37 ------------------- </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> net-analyzer/fping/fping-5.0.ebuild | 2 +- + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> net-analyzer/ipband/ipband-0.8.1-r1.ebuild | 36 ------------------- </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> net-analyzer/hunt/hunt-1.5_p6_p1.ebuild | 2 +- + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> net-analyzer/nast/nast-0.2.0-r1.ebuild | 38 -------------------- </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild | 2 +- + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> net-analyzer/ndsad/ndsad-1.33-r1.ebuild | 45 ------------------------ </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> net-analyzer/ike-scan/ike-scan-1.9.4.ebuild | 2 +- + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> net-analyzer/portmon/portmon-2.0.ebuild | 29 --------------- </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> net-analyzer/ipband/ipband-0.8.1-r2.ebuild | 2 +- + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> net-analyzer/rain/rain-1.2.9_beta1.ebuild | 28 --------------- </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild | 2 +- + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> net-analyzer/siphon/siphon-666-r1.ebuild | 35 ------------------ </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> net-analyzer/iptstate/iptstate-2.2.6.ebuild | 4 ++-- + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild | 33 ----------------- </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> net-analyzer/labrea/labrea-2.5_p1.ebuild | 2 +- + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> net-analyzer/xprobe/xprobe-0.3.ebuild | 30 ---------------- </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild | 2 +- + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> 16 files changed, 452 deletions(-) </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild | 2 +- + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> delete mode 100644 net-analyzer/braa/braa-0.82.ebuild </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> net-analyzer/nast/nast-0.2.0-r2.ebuild | 2 +- + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> delete mode 100644 net-analyzer/ethloop/ethloop-10-r3.ebuild </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> 17 files changed, 19 insertions(+), 19 deletions(-) + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> delete mode 100644 net-analyzer/hunt/hunt-1.5-r1.ebuild </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> delete mode 100644 net-analyzer/hunt/hunt-1.5-r3.ebuild </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced gentoo + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> delete mode 100644 net-analyzer/ibmonitor/ibmonitor-1.4.ebuild </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> delete mode 100644 net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild </pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> delete mode 100644 net-analyzer/ipband/ipband-0.8.1-r1.ebuild </pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> delete mode 100644 net-analyzer/nast/nast-0.2.0-r1.ebuild </pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> delete mode 100644 net-analyzer/ndsad/ndsad-1.33-r1.ebuild </pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> delete mode 100644 net-analyzer/portmon/portmon-2.0.ebuild +</pre></td></tr> + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> delete mode 100644 net-analyzer/rain/rain-1.2.9_beta1.ebuild +</pre></td></tr> + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> delete mode 100644 net-analyzer/siphon/siphon-666-r1.ebuild +</pre></td></tr> + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> delete mode 100644 net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild +</pre></td></tr> + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> delete mode 100644 net-analyzer/xprobe/xprobe-0.3.ebuild +</pre></td></tr> + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** syncing gentoo +</pre></td></tr> + <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>*** synced gentoo +</pre></td></tr> + <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo +</pre></td></tr> + <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |