From 3ece0325dd53a4997b6c9886ac65bce93e575c55 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 15 Mar 2021 22:07:49 +0000 Subject: 2021-03-15T22:00:01Z --- qgp.html | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'qgp.html') diff --git a/qgp.html b/qgp.html index c5a6d0fa4aaf..b145ef6c6c3f 100644 --- a/qgp.html +++ b/qgp.html @@ -40,35 +40,35 @@ 15
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
- 16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
*** syncing qgp
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
commands sometime before your next pull:
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
+            19
commands sometime before your next pull:
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.ff only       # fast-forward only
+            22
  git config pull.rebase true   # rebase
 

-            23
+            23
  git config pull.ff only       # fast-forward only
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
or --ff-only on the command line to override the configured default per
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
invocation.
+            27
or --ff-only on the command line to override the configured default per
 

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** syncing qgp
+            30
Already up to date.
 

             31
*** synced qgp
 

@@ -80,7 +80,7 @@
 

             35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qgp
 

-            36
 * dev-cpp/google-benchmark-1.3.0: failed sourcing ebuild: EAPI=6 is not supported
+            36
 * dev-cpp/google-benchmark-1.3.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line  45:  called die)
 
[FATAL]
             37
 * Cache regen failed with 1
 

-- 
cgit v1.2.3-65-gdbad