From f21335c10ce0d9d6950fe5932b0b233565e02557 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Oct 2020 02:05:10 +0000 Subject: 2020-10-04T02:00:01Z --- octopus.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'octopus.html') diff --git a/octopus.html b/octopus.html index d416215ea197..f37c917013fb 100644 --- a/octopus.html +++ b/octopus.html @@ -28,51 +28,47 @@ 9
$ pmaint sync octopus
- 10
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

-            11
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
discouraged. You can squelch this message by running one of the following
 

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

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

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

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

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

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

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

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

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

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

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

-            23
invocation.
+            23
Already up to date.
 

-            24
+            24
*** syncing octopus
 

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

-            26
*** syncing octopus
+            26
 * Sync succeeded
 

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

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

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

-            30
$ git show -q --pretty=format:%G? HEAD
-

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

-            32
 * Cache regenerated successfully
+            30
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad