From be3def55c8643a8c9b9683f7c826e3601005ada9 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 17:35:53 +0000 Subject: 2020-10-23T17:30:01Z --- chrisadr.html | 66 ++++++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) (limited to 'chrisadr.html') diff --git a/chrisadr.html b/chrisadr.html index 5265c40966d2..7aa8d8d65bf3 100644 --- a/chrisadr.html +++ b/chrisadr.html @@ -38,73 +38,55 @@ 14
$ pmaint sync chrisadr
- 15
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).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
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).
+            16
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
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).
+            17
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
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).
+            18
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
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).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
or --ff-only on the command line to override the configured default per
 

-            30
commands sometime before your next pull:
+            30
invocation.
 

             31
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
Already up to date.
 

-            33
  git config pull.rebase true   # rebase
+            33
*** syncing chrisadr
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** synced chrisadr
 

-            35
+            35
 * Sync succeeded
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git log --format=%ci -1
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrisadr
 

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing chrisadr
-

-            43
*** synced chrisadr
-

-            44
 * Sync succeeded
-

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

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

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrisadr
-

-            48
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad