summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spikyatlinux.html')
-rw-r--r--spikyatlinux.html32
1 files changed, 24 insertions, 8 deletions
diff --git a/spikyatlinux.html b/spikyatlinux.html
index b7da7bbec910..d06e65f52c48 100644
--- a/spikyatlinux.html
+++ b/spikyatlinux.html
@@ -34,21 +34,37 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync spikyatlinux
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>From https://github.com/spikyatlinux/ebuilds_for_gentoo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing spikyatlinux
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> + 45f1ad3...e78032d master -&gt; origin/master (forced update)
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced spikyatlinux
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>fatal: refusing to merge unrelated histories
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing spikyatlinux
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>!!! failed syncing spikyatlinux
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="err" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync failed with 1
+</pre></td><td>[FATAL]</td></tr>
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Will try to re-create
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint sync spikyatlinux
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/spikyatlinux'...
+</pre></td></tr>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** syncing spikyatlinux
+</pre></td></tr>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced spikyatlinux
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded after re-adding
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>