From 34d553007443b1c717fd65a232220584b1c7b977 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 10 Sep 2020 20:35:10 +0000 Subject: 2020-09-10T20:30:01Z --- go-overlay.html | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'go-overlay.html') diff --git a/go-overlay.html b/go-overlay.html index d140443856bb..5e2fb60b1db3 100644 --- a/go-overlay.html +++ b/go-overlay.html @@ -32,51 +32,53 @@ 11
$ pmaint sync go-overlay
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            15
+            15
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            24
+            24
invocation.
 

-            25
Already up to date.
+            25
 

-            26
*** syncing go-overlay
+            26
Already up to date.
 

-            27
*** synced go-overlay
+            27
*** syncing go-overlay
 

-            28
 * Sync succeeded
+            28
*** synced go-overlay
 

-            29
$ git log --format=%ci -1
+            29
 * Sync succeeded
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ git log --format=%ci -1
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 go-overlay
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
 * dev-util/goreleaser-0.35.6: failed sourcing ebuild: golang-common: EAPI=6 is not supported
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 go-overlay
+

+            33
 * dev-util/goreleaser-0.35.6: failed sourcing ebuild: golang-common: EAPI=6 is not supported
 
[FATAL]
-            33
 * dev-util/goreleaser-0.67.0: failed sourcing ebuild: golang-common: EAPI=6 is not supported
+            34
 * dev-util/goreleaser-0.67.0: failed sourcing ebuild: golang-common: EAPI=6 is not supported
 
[FATAL]
-            34
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad