From 345e2a5295daa1d4ed63ff9f92d54f8b26349836 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 30 Apr 2021 07:19:56 +0000 Subject: 2021-04-30T07:15:01Z --- octopus.html | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'octopus.html') diff --git a/octopus.html b/octopus.html index 734b987fa1e9..b1897dfd82df 100644 --- a/octopus.html +++ b/octopus.html @@ -26,51 +26,55 @@ 8
 'status': 'unofficial'}
- 9
$ pmaint sync octopus
+            9
pkgcore 0.11.2 -- extended version info unavailable
 

-            10
*** syncing octopus
+            10
 

-            11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
$ pmaint sync octopus
 

-            12
discouraged. You can squelch this message by running one of the following
+            12
*** syncing octopus
 

-            13
commands sometime before your next pull:
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
  git config pull.rebase false  # merge (the default strategy)
+            15
commands sometime before your next pull:
 

-            16
  git config pull.rebase true   # rebase
+            16
 

-            17
  git config pull.ff only       # fast-forward only
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
+            18
  git config pull.rebase true   # rebase
 

-            19
You can replace "git config" with "git config --global" to set a default
+            19
  git config pull.ff only       # fast-forward only
 

-            20
preference for all repositories. You can also pass --rebase, --no-rebase,
+            20
 

-            21
or --ff-only on the command line to override the configured default per
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
invocation.
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

-            24
Already up to date.
+            24
invocation.
 

-            25
*** synced octopus
+            25
 

-            26
 * Sync succeeded
+            26
Already up to date.
 

-            27
$ git log --format=%ci -1
+            27
*** synced octopus
 

-            28
$ git show -q --pretty=format:%G? HEAD
+            28
 * Sync succeeded
 

-            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
+            29
$ git log --format=%ci -1
 

-            30
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            30
$ git show -q --pretty=format:%G? HEAD
+

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

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

 
         
-- 
cgit v1.2.3-65-gdbad