diff options
Diffstat (limited to '9999.html')
| -rw-r--r-- | 9999.html | 52 |
1 files changed, 12 insertions, 40 deletions
diff --git a/9999.html b/9999.html index 12678bcc764b..27e5755717de 100644 --- a/9999.html +++ b/9999.html @@ -42,57 +42,29 @@ </pre></td></tr> <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>From https://github.com/257/9999 </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> + 25b417d...501e1fc main -> origin/main (forced update) + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> e3ee279..be4afb6 main -> origin/main </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Updating e3ee279..be4afb6 </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>hint: You can do so by running one of the following commands sometime before + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>hint: your next pull: + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> dev-db/pgx/Manifest | 2 ++ </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> 1 file changed, 2 insertions(+) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>hint: git config pull.rebase false # merge + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> create mode 100644 dev-db/pgx/Manifest </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: git config pull.rebase true # rebase + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced 9999 </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: + <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>hint: You can replace "git config" with "git config --global" to set a default + <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>hint: preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 9999 </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</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="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>hint: invocation. -</pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches. -</pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>!!! failed syncing 9999 -</pre></td></tr> - <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync failed with 1 -</pre></td><td>[FATAL]</td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Will try to re-create -</pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync 9999 -</pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** syncing 9999 -</pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/9999'... -</pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced 9999 -</pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded after re-adding -</pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 9999 -</pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |