From ed055f2462373f640dd6f1dbd2133e01717f5647 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 11 Jan 2021 02:35:07 +0000 Subject: 2021-01-11T02:30:01Z --- leio.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'leio.html') diff --git a/leio.html b/leio.html index abc10b34f8b8..0fd2cd4fa0a3 100644 --- a/leio.html +++ b/leio.html @@ -40,49 +40,51 @@ 15
$ pmaint sync leio
 
- 16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
WARNING:pkgcore:interactive-fiction repo at '/var/lib/repo-mirror-ci/sync/interactive-fiction', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 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 leio
+            30
Already up to date.
 
- 31
*** synced leio
+            31
*** syncing leio
 
- 32
 * Sync succeeded
+            32
*** synced leio
 
- 33
$ git log --format=%ci -1
+            33
 * Sync succeeded
 
- 34
$ git show -q --pretty=format:%G? HEAD
+            34
$ git log --format=%ci -1
 
- 35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leio
+            35
$ git show -q --pretty=format:%G? HEAD
 
- 36
 * www-plugins/chrome-token-signing-1.0.6: failed sourcing ebuild: EAPI=6 is not supported
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leio
+
+ 37
 * www-plugins/chrome-token-signing-1.0.6: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL] - 37
 * Cache regen failed with 1
+            38
 * Cache regen failed with 1
 
-- cgit v1.2.3-65-gdbad