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
|
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'/>
<link rel="stylesheet" type="text/css" href="log.css"/>
<title>QA check results for repository vGist</title>
</head>
<body>
<h1>vGist</h1>
<table class="log">
<tr class="" id="l1"><td><a href="#l1"><span>1</span></a></td><td><pre>{'description': {'en': 'vGist overlay, for personal use.'},
</pre></td></tr>
<tr class="" id="l2"><td><a href="#l2"><span>2</span></a></td><td><pre> 'feed': ['https://github.com/vgist/vgist-overlay/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/vgist/vgist-overlay',
</pre></td></tr>
<tr class="" id="l4"><td><a href="#l4"><span>4</span></a></td><td><pre> 'name': 'vGist',
</pre></td></tr>
<tr class="" id="l5"><td><a href="#l5"><span>5</span></a></td><td><pre> 'owner': [{'email': 'admin@mail.havee.me', 'name': 'havee', 'type': 'person'}],
</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/vgist/vgist-overlay.git'},
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> {'type': 'git', 'uri': 'git@github.com:vgist/vgist-overlay.git'}],
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> 'status': 'official'}
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>pkgcore 0.12.11
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing vGist
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>From https://github.com/vgist/vgist-overlay
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + f86427e...595ff51 master -> origin/master (forced update)
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them.
</pre></td></tr>
<tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before
</pre></td></tr>
<tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: your next pull:
</pre></td></tr>
<tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint:
</pre></td></tr>
<tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: git config pull.rebase false # merge
</pre></td></tr>
<tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: git config pull.rebase true # rebase
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: 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>hint:
</pre></td></tr>
<tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: 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>hint: 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>hint: 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>hint: invocation.
</pre></td></tr>
<tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches.
</pre></td></tr>
<tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>!!! failed syncing vGist
</pre></td></tr>
<tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync failed with 1
</pre></td><td>[FATAL]</td></tr>
<tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Will try to re-create
</pre></td></tr>
<tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
</pre></td></tr>
<tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing vGist
</pre></td></tr>
<tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/vGist'...
</pre></td></tr>
<tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced vGist
</pre></td></tr>
<tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded after re-adding
</pre></td></tr>
<tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
<tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
<tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
</pre></td></tr>
<tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
</body>
</html>
|
GitWeb