summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-08-27 14:05:17 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-08-27 14:05:17 +0000
commitbf1257de007ba69a6498f86d8c412509eaf1963c (patch)
treea733dbb54cfabace0a78d92fdcbd05b542ae982c /barzog-overlay.html
parent2020-08-27T13:30:01Z (diff)
downloadrepos-bf1257de007ba69a6498f86d8c412509eaf1963c.tar.gz
repos-bf1257de007ba69a6498f86d8c412509eaf1963c.tar.bz2
repos-bf1257de007ba69a6498f86d8c412509eaf1963c.zip
2020-08-27T14:00:01Z
Diffstat (limited to 'barzog-overlay.html')
-rw-r--r--barzog-overlay.html88
1 files changed, 43 insertions, 45 deletions
diff --git a/barzog-overlay.html b/barzog-overlay.html
index 5982e64491e6..16d4053f8c78 100644
--- a/barzog-overlay.html
+++ b/barzog-overlay.html
@@ -42,93 +42,91 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync barzog-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+ <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>warning: Pulling without specifying how to reconcile divergent branches is
+ <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>discouraged. You can squelch this message by running one of the following
+ <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>commands sometime before your next pull:
+ <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>
+ <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.rebase false # merge (the default strategy)
+ <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> git config pull.rebase true # rebase
+ <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> git config pull.ff only # fast-forward only
+ <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>
+ <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>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>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>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>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>or --ff-only on the command line to override the configured default per
+ <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>invocation.
+ <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>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing barzog-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing barzog-overlay
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced barzog-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced barzog-overlay
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 barzog-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 barzog-overlay
-</pre></td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-admin/ulogd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-admin/ulogd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-db/pg_ampq-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-db/pg_ampq-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-db/pgsentinel-1.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-db/pgsentinel-1.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-db/pgsql-http-1.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-db/pgsql-http-1.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-db/pldebugger-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-db/pldebugger-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-libs/libnl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-libs/libnl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-php/ZendGuardLoader-5.5.0: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-php/ZendGuardLoader-5.5.0: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-php/ffmpeg-php-0.6.0-r3: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-php/ffmpeg-php-0.6.0-r3: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-php/ffmpeg-php-0.6.0-r4: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-php/ffmpeg-php-0.6.0-r4: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-php/ioncube-loaders-5.0.19: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-php/ioncube-loaders-5.0.19: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-php/ioncube-loaders-5.1.2: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-php/ioncube-loaders-5.1.2: failed sourcing ebuild: inherit requires unknown eclass: php-ext-source-r2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-tv/astra-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-tv/astra-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-firewall/ipt_netflow-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-firewall/ipt_netflow-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-firewall/xt_NAT-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-firewall/xt_NAT-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/asterisk-chan_dongle-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/asterisk-chan_dongle-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/kmod-huawei-voice-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/kmod-huawei-voice-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/ladvd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/ladvd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-p2p/verlihub-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-p2p/verlihub-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-p2p/xbtt-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-p2p/xbtt-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-p2p/xbtt-telecom-1.10: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-p2p/xbtt-telecom-1.10: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * sci-geosciences/openstreetmap-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * sci-geosciences/openstreetmap-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * www-apache/mod_tile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * www-apache/mod_tile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>