From da3ab41b4cdffef17ccd87f0e3bad5d994baf55c Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 12 Apr 2021 04:19:53 +0000 Subject: 2021-04-12T04:15:01Z --- octopus.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'octopus.html') diff --git a/octopus.html b/octopus.html index d937e1dfd569..734b987fa1e9 100644 --- a/octopus.html +++ b/octopus.html @@ -28,51 +28,49 @@ 9
$ pmaint sync octopus
- 10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
*** syncing octopus
 

-            11
*** syncing octopus
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            14
commands sometime before your next pull:
+            14
 

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

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

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

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

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

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

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

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

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** synced octopus
 

-            26
*** synced octopus
+            26
 * Sync succeeded
 

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

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

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

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
-

-            31
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            30
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            32
 * Cache regen failed with 1
+            31
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad