From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- average.html | 54 +++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) (limited to 'average.html') diff --git a/average.html b/average.html index 39b32d7d3458..a384b749ccd5 100644 --- a/average.html +++ b/average.html @@ -40,59 +40,47 @@ 15
$ pmaint sync average
- 16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            18
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

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

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
  git config pull.ff only       # fast-forward only
 

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

-            24
commands sometime before your next pull:
+            24
You can replace "git config" with "git config --global" to set a default
 

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

-            26
  git config pull.rebase false  # merge (the default strategy)
+            26
or --ff-only on the command line to override the configured default per
 

-            27
  git config pull.rebase true   # rebase
+            27
invocation.
 

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

-            29
+            29
Already up to date.
 

-            30
You can replace "git config" with "git config --global" to set a default
+            30
*** syncing average
 

-            31
preference for all repositories. You can also pass --rebase, --no-rebase,
+            31
*** synced average
 

-            32
or --ff-only on the command line to override the configured default per
+            32
 * Sync succeeded
 

-            33
invocation.
+            33
$ git log --format=%ci -1
 

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

-            35
Already up to date.
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 average
 

-            36
*** syncing average
-

-            37
*** synced average
-

-            38
 * Sync succeeded
-

-            39
$ git log --format=%ci -1
-

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

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 average
-

-            42
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad