From 7b18200db4c7403fb3580c440a52f3bac8a46cb4 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 31 Mar 2021 20:22:18 +0000 Subject: 2021-03-31T20:15:01Z --- tamiko.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'tamiko.html') diff --git a/tamiko.html b/tamiko.html index ccb1147ead61..56146464211f 100644 --- a/tamiko.html +++ b/tamiko.html @@ -42,51 +42,49 @@ 16
$ pmaint sync tamiko
- 17
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).
+            17
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing tamiko
 

-            19
*** syncing tamiko
+            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 tamiko
 

-            34
*** synced tamiko
+            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 tamiko
 

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

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad