diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-17 00:05:26 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-17 00:05:26 +0000 |
| commit | 4c342fecfbfbf17aac09b9b8c3a377334d9e379e (patch) | |
| tree | fe849b264be07bcb1f566dca7917a9505ef17e36 /kde.html | |
| parent | 2020-11-16T23:30:01Z (diff) | |
| download | repos-4c342fecfbfbf17aac09b9b8c3a377334d9e379e.tar.gz repos-4c342fecfbfbf17aac09b9b8c3a377334d9e379e.tar.bz2 repos-4c342fecfbfbf17aac09b9b8c3a377334d9e379e.zip | |
2020-11-17T00:00:01Z
Diffstat (limited to 'kde.html')
| -rw-r--r-- | kde.html | 142 |
1 files changed, 121 insertions, 21 deletions
@@ -38,47 +38,147 @@ </pre></td></tr> <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync kde </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:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', 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: Pulling without specifying how to reconcile divergent branches is </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>discouraged. You can squelch this message by running one of the following </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>commands sometime before your next pull: </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> </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> git config pull.rebase false # merge (the default strategy) </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 true # rebase </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.ff only # fast-forward only </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> </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>You can replace "git config" with "git config --global" to set a default </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>preference for all repositories. You can also pass --rebase, --no-rebase, </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>or --ff-only on the command line to override the configured default per </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>invocation. </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date. + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing kde + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/proj/kde </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced kde + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 79ba014868..b801f2a7d7 master -> origin/master </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 79ba014868..b801f2a7d7 </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> Documentation/maintainers/regenerate-files | 2 +- </pre></td></tr> - <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 kde + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> .../.kde-frameworks-5.75/_HEADER_ | 2 - </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../kde-frameworks-portingaids-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier1-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier2-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier3-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> .../.kde-frameworks-5.75/more-deps | 0 +</pre></td></tr> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> .../kde-frameworks-5.75.keywords | 92 ---------------------- +</pre></td></tr> + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> Documentation/package.mask/kde-frameworks-5.75 | 92 ---------------------- +</pre></td></tr> + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> .../package.unmask/.kde-frameworks-5.75/_HEADER_ | 2 - +</pre></td></tr> + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> .../kde-frameworks-portingaids-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier1-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier2-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> .../.kde-frameworks-5.75/kde-frameworks-tier3-5.75 | 1 - +</pre></td></tr> + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> Documentation/package.unmask/kde-frameworks-5.75 | 92 ---------------------- +</pre></td></tr> + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> eclass/ecm.eclass | 25 ------ +</pre></td></tr> + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> eclass/kde.org.eclass | 7 +- +</pre></td></tr> + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> sets/kde-frameworks-5.75 | 6 -- +</pre></td></tr> + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> sets/kde-frameworks-portingaids-5.75 | 10 --- +</pre></td></tr> + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> sets/kde-frameworks-tier1-5.75 | 35 -------- +</pre></td></tr> + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> sets/kde-frameworks-tier2-5.75 | 16 ---- +</pre></td></tr> + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> sets/kde-frameworks-tier3-5.75 | 26 ------ +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> 24 files changed, 6 insertions(+), 411 deletions(-) +</pre></td></tr> + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> delete mode 100644 Documentation/package.accept_keywords/.kde-frameworks-5.75/_HEADER_ +</pre></td></tr> + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> delete mode 120000 Documentation/package.accept_keywords/.kde-frameworks-5.75/kde-frameworks-5.75 +</pre></td></tr> + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> delete mode 120000 Documentation/package.accept_keywords/.kde-frameworks-5.75/kde-frameworks-portingaids-5.75 +</pre></td></tr> + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> delete mode 120000 Documentation/package.accept_keywords/.kde-frameworks-5.75/kde-frameworks-tier1-5.75 +</pre></td></tr> + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> delete mode 120000 Documentation/package.accept_keywords/.kde-frameworks-5.75/kde-frameworks-tier2-5.75 +</pre></td></tr> + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> delete mode 120000 Documentation/package.accept_keywords/.kde-frameworks-5.75/kde-frameworks-tier3-5.75 +</pre></td></tr> + <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> delete mode 100644 Documentation/package.accept_keywords/.kde-frameworks-5.75/more-deps +</pre></td></tr> + <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> delete mode 100644 Documentation/package.accept_keywords/kde-frameworks-5.75.keywords +</pre></td></tr> + <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> delete mode 100644 Documentation/package.mask/kde-frameworks-5.75 +</pre></td></tr> + <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> delete mode 100644 Documentation/package.unmask/.kde-frameworks-5.75/_HEADER_ +</pre></td></tr> + <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> delete mode 120000 Documentation/package.unmask/.kde-frameworks-5.75/kde-frameworks-5.75 +</pre></td></tr> + <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> delete mode 120000 Documentation/package.unmask/.kde-frameworks-5.75/kde-frameworks-portingaids-5.75 +</pre></td></tr> + <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> delete mode 120000 Documentation/package.unmask/.kde-frameworks-5.75/kde-frameworks-tier1-5.75 +</pre></td></tr> + <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> delete mode 120000 Documentation/package.unmask/.kde-frameworks-5.75/kde-frameworks-tier2-5.75 +</pre></td></tr> + <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> delete mode 120000 Documentation/package.unmask/.kde-frameworks-5.75/kde-frameworks-tier3-5.75 +</pre></td></tr> + <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> delete mode 100644 Documentation/package.unmask/kde-frameworks-5.75 +</pre></td></tr> + <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> delete mode 100644 sets/kde-frameworks-5.75 +</pre></td></tr> + <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> delete mode 100644 sets/kde-frameworks-portingaids-5.75 +</pre></td></tr> + <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> delete mode 100644 sets/kde-frameworks-tier1-5.75 +</pre></td></tr> + <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> delete mode 100644 sets/kde-frameworks-tier2-5.75 +</pre></td></tr> + <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> delete mode 100644 sets/kde-frameworks-tier3-5.75 +</pre></td></tr> + <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>*** syncing kde +</pre></td></tr> + <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>*** synced kde +</pre></td></tr> + <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kde +</pre></td></tr> + <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |