From 3cb1851709d8e7ac04225f68a34ee7bfccf071ef Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 15 Mar 2021 18:37:37 +0000 Subject: 2021-03-15T18:30:01Z --- science.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'science.html') diff --git a/science.html b/science.html index f413e742d2f2..c12f4dcc5a98 100644 --- a/science.html +++ b/science.html @@ -66,51 +66,49 @@ 28
$ pmaint sync science
- 29
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).
+            29
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            33
commands sometime before your next pull:
+            33
 

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

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

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

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

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

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

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

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

-            42
invocation.
+            42
 

-            43
+            43
Already up to date.
 

-            44
Already up to date.
+            44
*** syncing science
 

-            45
*** syncing science
+            45
*** synced science
 

-            46
*** synced science
+            46
 * Sync succeeded
 

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

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

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

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science
-

-            51
 * Cache regenerated successfully
+            50
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad