diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-07 02:17:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-07 02:17:16 +0000 |
| commit | 88bca50baa3623549ecc926dc2b1c3428c1b06e6 (patch) | |
| tree | 51822e28a699d68abb04c4b74abab1308a7e6a3e /tatsh-overlay.html | |
| parent | 2023-09-07T02:00:02Z (diff) | |
| download | repos-88bca50baa3623549ecc926dc2b1c3428c1b06e6.tar.gz repos-88bca50baa3623549ecc926dc2b1c3428c1b06e6.tar.bz2 repos-88bca50baa3623549ecc926dc2b1c3428c1b06e6.zip | |
2023-09-07T02:15:01Z
Diffstat (limited to 'tatsh-overlay.html')
| -rw-r--r-- | tatsh-overlay.html | 82 |
1 files changed, 27 insertions, 55 deletions
diff --git a/tatsh-overlay.html b/tatsh-overlay.html index 74f505cd161b..99943471a9e0 100644 --- a/tatsh-overlay.html +++ b/tatsh-overlay.html @@ -48,85 +48,57 @@ </pre></td></tr> <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>From https://github.com/Tatsh/tatsh-overlay </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> 9b1ecfae..a1a9049b master -> origin/master + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> + a1a9049b...28cf980c master -> origin/master (forced update) </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Updating 9b1ecfae..a1a9049b + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>hint: You have divergent branches and need to specify how to reconcile them. </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Fast-forward + <tr class="" id="l22"><td><a href="#l22"><span>22</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="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> app-eselect/eselect-dotnet/Manifest | 1 + + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>hint: your next pull: </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> .../eselect-dotnet/eselect-dotnet-0.1.0.ebuild | 25 + + <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> app-eselect/eselect-dotnet/metadata.xml | 9 + + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>hint: git config pull.rebase false # merge </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> dev-dotnet/dotnet-runtime-nugets/Manifest | 77 +++ + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>hint: git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> .../dotnet-runtime-nugets-3.1.32.ebuild | 56 ++ + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>hint: git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> .../dotnet-runtime-nugets-6.0.12.ebuild | 59 ++ + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>hint: </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> .../dotnet-runtime-nugets-6.0.16.ebuild | 59 ++ + <tr class="" id="l29"><td><a href="#l29"><span>29</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="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> .../dotnet-runtime-nugets-7.0.5.ebuild | 59 ++ + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>hint: preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> dev-dotnet/dotnet-runtime-nugets/metadata.xml | 9 + + <tr class="" id="l31"><td><a href="#l31"><span>31</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="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> .../dotnet-sdk-bin-6.0.404-r1.ebuild | 70 +++ + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>hint: invocation. </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> .../dotnet-sdk-bin/dotnet-sdk-bin-7.0.203.ebuild | 71 +++ + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>fatal: Need to specify how to reconcile divergent branches. </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> eclass/dotnet-pkg-base.eclass | 608 +++++++++++++++++++++ + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>!!! failed syncing tatsh-overlay </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> eclass/dotnet-pkg.eclass | 258 +++++++++ + <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync failed with 1 +</pre></td><td>[FATAL]</td></tr> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Will try to re-create </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> eclass/nuget.eclass | 197 +++++++ + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> scripts/update-dotnet-32109.sh | 17 + + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing tatsh-overlay </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> 15 files changed, 1575 insertions(+) + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'... </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> create mode 100644 app-eselect/eselect-dotnet/Manifest + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced tatsh-overlay </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> create mode 100644 app-eselect/eselect-dotnet/eselect-dotnet-0.1.0.ebuild + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded after re-adding </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> create mode 100644 app-eselect/eselect-dotnet/metadata.xml + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/Manifest + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-3.1.32.ebuild + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.12.ebuild -</pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-6.0.16.ebuild -</pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/dotnet-runtime-nugets-7.0.5.ebuild -</pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-runtime-nugets/metadata.xml -</pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.404-r1.ebuild -</pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> create mode 100644 dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-7.0.203.ebuild -</pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> create mode 100644 eclass/dotnet-pkg-base.eclass -</pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> create mode 100644 eclass/dotnet-pkg.eclass -</pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> create mode 100644 eclass/nuget.eclass -</pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> create mode 100755 scripts/update-dotnet-32109.sh -</pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced tatsh-overlay -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay -</pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |