summaryrefslogtreecommitdiff
blob: dce091bc878fa7b91818e315fac91481979dc937 (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
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
<!DOCTYPE html>
<html>
    <head>
        <meta charset='utf-8'/>
        <link rel="stylesheet" type="text/css" href="log.css"/>
        <title>QA check results for repository haskell</title>
    </head>
    <body>
        <h1>haskell</h1>

        <table class="log">

            <tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'The Official Gentoo Haskell overlay.'},
</pre></td></tr>
            <tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'feed': ['https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom'],
</pre></td></tr>
            <tr class="" id="l3"><td><a href="#l3"><span>3</span></a></td><td><pre> 'homepage': 'https://github.com/gentoo-haskell',
</pre></td></tr>
            <tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'name': 'haskell',
</pre></td></tr>
            <tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'owner': [{'email': 'haskell@gentoo.org', 'type': 'project'}],
</pre></td></tr>
            <tr class="" id="l6"><td><a href="#l6"><span>6</span></a></td><td><pre> 'quality': 'experimental',
</pre></td></tr>
            <tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> 'source': [{'type': 'git',
</pre></td></tr>
            <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>             'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'},
</pre></td></tr>
            <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>            {'type': 'git',
</pre></td></tr>
            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>             'uri': 'git://github.com/gentoo-haskell/gentoo-haskell.git'},
</pre></td></tr>
            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>            {'type': 'git',
</pre></td></tr>
            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>             'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'}],
</pre></td></tr>
            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> 'status': 'official'}
</pre></td></tr>
            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync haskell
</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
</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
</pre></td></tr>
            <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>
</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)
</pre></td></tr>
            <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.ff only       # fast-forward only
</pre></td></tr>
            <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>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>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>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>invocation.
</pre></td></tr>
            <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>From https://github.com/gentoo-haskell/gentoo-haskell
</pre></td></tr>
            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>   a316e28d3..d993153e1  master     -&gt; origin/master
</pre></td></tr>
            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating a316e28d3..d993153e1
</pre></td></tr>
            <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> dev-haskell/binary-instances/Manifest              |  1 -
</pre></td></tr>
            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../binary-instances-1.0.0.1.ebuild                | 50 --------------
</pre></td></tr>
            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-haskell/binary-tagged/Manifest                 |  1 -
</pre></td></tr>
            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-haskell/binary-tagged/binary-tagged-0.2.ebuild | 49 --------------
</pre></td></tr>
            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-haskell/byline/Manifest                        |  1 +
</pre></td></tr>
            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-haskell/byline/byline-1.0.0.0.ebuild           | 41 ++++++++++++
</pre></td></tr>
            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-haskell/byline/metadata.xml                    |  2 +-
</pre></td></tr>
            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-haskell/clash-ghc/Manifest                     |  1 -
</pre></td></tr>
            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-haskell/clash-ghc/clash-ghc-1.0.1.ebuild       | 51 ---------------
</pre></td></tr>
            <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-haskell/clash-lib/Manifest                     |  1 -
</pre></td></tr>
            <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-haskell/clash-lib/clash-lib-1.0.1.ebuild       | 59 -----------------
</pre></td></tr>
            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-haskell/clash-lib/metadata.xml                 |  1 -
</pre></td></tr>
            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> dev-haskell/clash-prelude/Manifest                 |  1 -
</pre></td></tr>
            <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> .../clash-prelude/clash-prelude-1.0.1.ebuild       | 61 -----------------
</pre></td></tr>
            <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> dev-haskell/clash-prelude/metadata.xml             |  2 -
</pre></td></tr>
            <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> dev-haskell/clckwrks-plugin-page/Manifest          |  1 -
</pre></td></tr>
            <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> .../clckwrks-plugin-page-0.4.3.22.ebuild           | 50 --------------
</pre></td></tr>
            <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> dev-haskell/clckwrks/Manifest                      |  1 -
</pre></td></tr>
            <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> dev-haskell/clckwrks/clckwrks-0.26.1.ebuild        | 73 ---------------------
</pre></td></tr>
            <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> dev-haskell/fay/Manifest                           |  1 -
</pre></td></tr>
            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> dev-haskell/fay/fay-0.24.1.0.ebuild                | 53 ---------------
</pre></td></tr>
            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> dev-haskell/hpqtypes/Manifest                      |  1 -
</pre></td></tr>
            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> dev-haskell/hpqtypes/hpqtypes-1.8.0.1.ebuild       | 57 ----------------
</pre></td></tr>
            <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> dev-haskell/influxdb/Manifest                      |  1 -
</pre></td></tr>
            <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> dev-haskell/influxdb/influxdb-1.7.1.2.ebuild       | 59 -----------------
</pre></td></tr>
            <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> dev-haskell/jsaddle-wkwebview/Manifest             |  1 -
</pre></td></tr>
            <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> .../jsaddle-wkwebview-0.9.6.0.ebuild               | 33 ----------
</pre></td></tr>
            <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> dev-haskell/log-postgres/Manifest                  |  1 -
</pre></td></tr>
            <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> .../log-postgres/log-postgres-0.7.1.1.ebuild       | 46 -------------
</pre></td></tr>
            <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> dev-haskell/monoidal-containers/Manifest           |  1 -
</pre></td></tr>
            <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> .../monoidal-containers-0.4.0.0.ebuild             | 30 ---------
</pre></td></tr>
            <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> dev-haskell/pandoc-types/Manifest                  |  2 -
</pre></td></tr>
            <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> .../pandoc-types/pandoc-types-1.17.6.ebuild        | 40 ------------
</pre></td></tr>
            <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> dev-haskell/pandoc-types/pandoc-types-1.20.ebuild  | 34 ----------
</pre></td></tr>
            <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> dev-haskell/persistent-template/Manifest           |  1 -
</pre></td></tr>
            <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> .../persistent-template-2.8.2.3.ebuild             | 35 ----------
</pre></td></tr>
            <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> dev-haskell/scotty/Manifest                        |  1 -
</pre></td></tr>
            <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> dev-haskell/scotty/scotty-0.11.5-r1.ebuild         | 59 -----------------
</pre></td></tr>
            <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> dev-haskell/themoviedb/Manifest                    |  1 -
</pre></td></tr>
            <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> dev-haskell/themoviedb/themoviedb-1.1.5.2.ebuild   | 39 -----------
</pre></td></tr>
            <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> .../{these-1.0.1.ebuild =&gt; these-1.0.1-r1.ebuild}  | 10 +--
</pre></td></tr>
            <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> dev-haskell/tree-diff/tree-diff-0.1.ebuild         | 58 -----------------
</pre></td></tr>
            <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> dev-haskell/userid/Manifest                        |  1 -
</pre></td></tr>
            <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> dev-haskell/userid/userid-0.1.3.5.ebuild           | 30 ---------
</pre></td></tr>
            <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> dev-haskell/vimeta/Manifest                        |  1 -
</pre></td></tr>
            <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> .../vimeta/files/vimeta-0.2.4.0-aeson-1.3.patch    | 25 -------
</pre></td></tr>
            <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> .../vimeta/files/vimeta-0.2.4.0-either-5.patch     | 66 -------------------
</pre></td></tr>
            <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> dev-haskell/vimeta/vimeta-0.2.5.1.ebuild           | 40 ------------
</pre></td></tr>
            <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> profiles/package.mask                              |  6 --
</pre></td></tr>
            <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> x11-misc/taffybar/Manifest                         |  1 -
</pre></td></tr>
            <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> x11-misc/taffybar/taffybar-3.2.2.ebuild            | 76 ----------------------
</pre></td></tr>
            <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> 51 files changed, 49 insertions(+), 1208 deletions(-)
</pre></td></tr>
            <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> delete mode 100644 dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild
</pre></td></tr>
            <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> delete mode 100644 dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
</pre></td></tr>
            <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> create mode 100644 dev-haskell/byline/byline-1.0.0.0.ebuild
</pre></td></tr>
            <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> delete mode 100644 dev-haskell/clash-ghc/clash-ghc-1.0.1.ebuild
</pre></td></tr>
            <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> delete mode 100644 dev-haskell/clash-lib/clash-lib-1.0.1.ebuild
</pre></td></tr>
            <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> delete mode 100644 dev-haskell/clash-prelude/clash-prelude-1.0.1.ebuild
</pre></td></tr>
            <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> delete mode 100644 dev-haskell/clckwrks-plugin-page/clckwrks-plugin-page-0.4.3.22.ebuild
</pre></td></tr>
            <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> delete mode 100644 dev-haskell/clckwrks/clckwrks-0.26.1.ebuild
</pre></td></tr>
            <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> delete mode 100644 dev-haskell/fay/fay-0.24.1.0.ebuild
</pre></td></tr>
            <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> delete mode 100644 dev-haskell/hpqtypes/hpqtypes-1.8.0.1.ebuild
</pre></td></tr>
            <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> delete mode 100644 dev-haskell/influxdb/influxdb-1.7.1.2.ebuild
</pre></td></tr>
            <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> delete mode 100644 dev-haskell/jsaddle-wkwebview/jsaddle-wkwebview-0.9.6.0.ebuild
</pre></td></tr>
            <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> delete mode 100644 dev-haskell/log-postgres/log-postgres-0.7.1.1.ebuild
</pre></td></tr>
            <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> delete mode 100644 dev-haskell/monoidal-containers/monoidal-containers-0.4.0.0.ebuild
</pre></td></tr>
            <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> delete mode 100644 dev-haskell/pandoc-types/pandoc-types-1.17.6.ebuild
</pre></td></tr>
            <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> delete mode 100644 dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
</pre></td></tr>
            <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> delete mode 100644 dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
</pre></td></tr>
            <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> delete mode 100644 dev-haskell/scotty/scotty-0.11.5-r1.ebuild
</pre></td></tr>
            <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> delete mode 100644 dev-haskell/themoviedb/themoviedb-1.1.5.2.ebuild
</pre></td></tr>
            <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> rename dev-haskell/these/{these-1.0.1.ebuild =&gt; these-1.0.1-r1.ebuild} (81%)
</pre></td></tr>
            <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> delete mode 100644 dev-haskell/tree-diff/tree-diff-0.1.ebuild
</pre></td></tr>
            <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> delete mode 100644 dev-haskell/userid/userid-0.1.3.5.ebuild
</pre></td></tr>
            <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> delete mode 100644 dev-haskell/vimeta/files/vimeta-0.2.4.0-aeson-1.3.patch
</pre></td></tr>
            <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> delete mode 100644 dev-haskell/vimeta/files/vimeta-0.2.4.0-either-5.patch
</pre></td></tr>
            <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> delete mode 100644 dev-haskell/vimeta/vimeta-0.2.5.1.ebuild
</pre></td></tr>
            <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> delete mode 100644 x11-misc/taffybar/taffybar-3.2.2.ebuild
</pre></td></tr>
            <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>*** syncing haskell
</pre></td></tr>
            <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>*** synced haskell
</pre></td></tr>
            <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
            <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
            <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
            <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haskell
</pre></td></tr>
            <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>

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