diff options
Diffstat (limited to 'argent-main.html')
-rw-r--r-- | argent-main.html | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/argent-main.html b/argent-main.html index 06fce7106123..392d49e97061 100644 --- a/argent-main.html +++ b/argent-main.html @@ -32,61 +32,61 @@ </pre></td></tr> <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> 'status': 'unofficial'} </pre></td></tr> - <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync argent-main + <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository </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 + <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync argent-main </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 + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/argent-main'... </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Updating files: 84% (7905/9346) </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Updating files: 85% (7945/9346) </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) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Updating files: 86% (8038/9346) </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Updating files: 87% (8132/9346) </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 + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Updating files: 88% (8225/9346) </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Updating files: 89% (8318/9346) </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 + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Updating files: 90% (8412/9346) </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, + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Updating files: 91% (8505/9346) </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 + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Updating files: 92% (8599/9346) </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation. + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Updating files: 93% (8692/9346) </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Updating files: 94% (8786/9346) </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>fatal: unable to access 'https://gitlab.com/argent/argent-main.git/': The requested URL returned error: 522 + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Updating files: 95% (8879/9346) </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing argent-main + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Updating files: 96% (8973/9346) </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>!!! failed syncing argent-main + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Updating files: 97% (9066/9346) </pre></td></tr> - <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Will try to re-create + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating files: 98% (9160/9346) </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint sync argent-main + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating files: 99% (9253/9346) </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:khoverlay repo at '/var/lib/repo-mirror-ci/sync/khoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating files: 100% (9346/9346) </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating files: 100% (9346/9346), done. </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing argent-main </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/argent-main'... + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced argent-main </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>fatal: unable to access 'https://gitlab.com/argent/argent-main.git/': The requested URL returned error: 522 + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing argent-main + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>!!! failed syncing argent-main + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync failed again with 1, removing + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 argent-main +</pre></td></tr> + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |