From 17312bc491bd0843dd1351fdd4c0dab2a1e178da Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 3 May 2021 08:34:56 +0000 Subject: 2021-05-03T08:30:01Z --- johnmh.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'johnmh.html') diff --git a/johnmh.html b/johnmh.html index 7cfb0e677d7a..9b8e2a1bf5ba 100644 --- a/johnmh.html +++ b/johnmh.html @@ -44,51 +44,49 @@ 17
$ pmaint sync johnmh
- 18
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).
+            18
*** syncing johnmh
 

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

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

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

-            22
commands sometime before your next pull:
+            22
 

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

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

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

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

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

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

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

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

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

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

-            34
*** synced johnmh
+            34
 * Sync succeeded
 

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

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

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

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

-            39
 * 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)
+            38
 * 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]
-            40
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad