summaryrefslogtreecommitdiff
blob: 55cb176d490ba9c164b0b18b3b1c691d0101aea0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
<!DOCTYPE html>
<html>
    <head>
        <meta charset='utf-8'/>
        <link rel="stylesheet" type="text/css" href="log.css"/>
        <title>QA check results for repository pentoo</title>
    </head>
    <body>
        <h1>pentoo</h1>

        <table class="log">

            <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'The overlay contains new or updated security tools.'},
</pre></td></tr>
            <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'homepage': 'http://www.pentoo.ch',
</pre></td></tr>
            <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'name': 'pentoo',
</pre></td></tr>
            <tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'owner': [{'email': 'zerochaos@gentoo.org', 'type': 'person'}],
</pre></td></tr>
            <tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'quality': 'experimental',
</pre></td></tr>
            <tr class="" id="l6"><td><a href="#l6"><span>6</span></a></td><td><pre> 'source': [{'type': 'git',
</pre></td></tr>
            <tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre>             'uri': 'https://github.com/pentoo/pentoo-overlay.git'},
</pre></td></tr>
            <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>            {'type': 'git',
</pre></td></tr>
            <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>             'uri': 'git://github.com/pentoo/pentoo-overlay.git'},
</pre></td></tr>
            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>            {'type': 'git', 'uri': 'git@github.com:pentoo/pentoo-overlay.git'}],
</pre></td></tr>
            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> 'status': 'official'}
</pre></td></tr>
            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pentoo
</pre></td></tr>
            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
</pre></td></tr>
            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
</pre></td></tr>
            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
</pre></td></tr>
            <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>You can replace "git config" with "git config --global" to set a default
</pre></td></tr>
            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>From https://github.com/pentoo/pentoo-overlay
</pre></td></tr>
            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>   a973fa977..29526e50c  master     -&gt; origin/master
</pre></td></tr>
            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating a973fa977..29526e50c
</pre></td></tr>
            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Fast-forward
</pre></td></tr>
            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> sys-kernel/pentoo-sources/Manifest                           |  6 +++---
</pre></td></tr>
            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> .../files/{config-amd64-5.8.7 =&gt; config-amd64-5.8.12}        |  7 ++-----
</pre></td></tr>
            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> sys-kernel/pentoo-sources/files/config-amd64-latest          |  2 +-
</pre></td></tr>
            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../files/{config-x86-5.8.7 =&gt; config-x86-5.8.12}            |  7 ++-----
</pre></td></tr>
            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> sys-kernel/pentoo-sources/files/config-x86-latest            |  2 +-
</pre></td></tr>
            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> ...too-sources-5.8.7.ebuild =&gt; pentoo-sources-5.8.12.ebuild} | 12 ++++++------
</pre></td></tr>
            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> 6 files changed, 15 insertions(+), 21 deletions(-)
</pre></td></tr>
            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> rename sys-kernel/pentoo-sources/files/{config-amd64-5.8.7 =&gt; config-amd64-5.8.12} (99%)
</pre></td></tr>
            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> rename sys-kernel/pentoo-sources/files/{config-x86-5.8.7 =&gt; config-x86-5.8.12} (99%)
</pre></td></tr>
            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> rename sys-kernel/pentoo-sources/{pentoo-sources-5.8.7.ebuild =&gt; pentoo-sources-5.8.12.ebuild} (90%)
</pre></td></tr>
            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing pentoo
</pre></td></tr>
            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced pentoo
</pre></td></tr>
            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pentoo
</pre></td></tr>
            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>

        </table>
    </body>
</html>