From 8c00fc2f4a94521f4184b7c6e4dc777d33a341fa Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 19 Apr 2021 18:19:50 +0000 Subject: 2021-04-19T18:15:01Z --- johnmh.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'johnmh.html') diff --git a/johnmh.html b/johnmh.html index c66f90d19b0e..4dcdcd4f5295 100644 --- a/johnmh.html +++ b/johnmh.html @@ -40,51 +40,49 @@ 15
$ pmaint sync johnmh
- 16
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** syncing johnmh
 

-            17
*** syncing johnmh
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            20
commands sometime before your next pull:
+            20
 

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced johnmh
 

-            32
*** synced johnmh
+            32
 * Sync succeeded
 

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

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

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
-

-            37
 * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
+            36
 * games-strategy/freeorion-0.4.6: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-any-r1, (python-any-r1.eclass, line  41:  called die)
 
[FATAL]
-            38
 * Cache regen failed with 1
+            37
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad