diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-01 16:35:15 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-01 16:35:15 +0000 |
| commit | 42c5f7c0ca1361519e0ecf9763deb429503bc239 (patch) | |
| tree | 7a789e34c9ee1f6ad0e9def2f2380346cb530312 /gentoo.html | |
| parent | 2020-09-01T16:00:01Z (diff) | |
| download | repos-42c5f7c0ca1361519e0ecf9763deb429503bc239.tar.gz repos-42c5f7c0ca1361519e0ecf9763deb429503bc239.tar.bz2 repos-42c5f7c0ca1361519e0ecf9763deb429503bc239.zip | |
2020-09-01T16:30:01Z
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/gentoo.html b/gentoo.html index d994a4b7acb1..91e3ede3e17c 100644 --- a/gentoo.html +++ b/gentoo.html @@ -40,89 +40,83 @@ </pre></td></tr> <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> 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>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>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>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>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>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>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> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 9c362599343..b6a43790a78 master -> origin/master + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 9c362599343..b6a43790a78 + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> b6a43790a78..00034de1501 master -> origin/master </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Updating b6a43790a78..00034de1501 </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> dev-haskell/ifelse/ifelse-0.85.ebuild | 28 -------------------- + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> dev-haskell/language-c/Manifest | 1 - + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> app-misc/uptimed/uptimed-0.4.2.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-haskell/language-c/language-c-0.4.2.ebuild | 29 --------------------- + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> dev-lua/lua-zlib/Manifest | 1 + </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-haskell/newtype/Manifest | 1 - + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> dev-lua/lua-zlib/lua-zlib-1.2.ebuild | 28 ++++++++++++++++ </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-haskell/newtype/newtype-0.2.ebuild | 22 ---------------- + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-util/imediff2/imediff2-1.1.2-r6.ebuild | 39 ++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-haskell/objectname/Manifest | 1 - + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> eclass/java-pkg-simple.eclass | 2 +- </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-haskell/objectname/objectname-1.0.0.0.ebuild | 27 -------------------- + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> media-libs/openal/openal-1.20.1.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-haskell/puremd5/Manifest | 1 - + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> net-misc/whois/whois-5.5.6-r1.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> dev-haskell/puremd5/puremd5-2.1.2.1.ebuild | 31 ----------------------- + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> sys-apps/help2man/help2man-1.47.16.ebuild | 2 +- </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> dev-haskell/regex-posix/Manifest | 1 - + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> sys-power/acpilight/Manifest | 1 - </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> dev-haskell/regex-posix/regex-posix-0.95.2.ebuild | 23 ----------------- + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> ...cpilight-1.1.ebuild => acpilight-1.2-r1.ebuild} | 13 ++++---- </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> 11 files changed, 165 deletions(-) + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> 10 files changed, 80 insertions(+), 12 deletions(-) </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> delete mode 100644 dev-haskell/ifelse/ifelse-0.85.ebuild + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> create mode 100644 dev-lua/lua-zlib/lua-zlib-1.2.ebuild </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> delete mode 100644 dev-haskell/language-c/language-c-0.4.2.ebuild + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> create mode 100644 dev-util/imediff2/imediff2-1.1.2-r6.ebuild </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> delete mode 100644 dev-haskell/newtype/newtype-0.2.ebuild + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> rename sys-power/acpilight/{acpilight-1.1.ebuild => acpilight-1.2-r1.ebuild} (84%) </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> delete mode 100644 dev-haskell/objectname/objectname-1.0.0.0.ebuild + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing gentoo </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> delete mode 100644 dev-haskell/puremd5/puremd5-2.1.2.1.ebuild + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced gentoo </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> delete mode 100644 dev-haskell/regex-posix/regex-posix-0.95.2.ebuild + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced gentoo + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo -</pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |