From 8fc0b36519bab0c859d80f139bc0c8715e865c7e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 12:36:44 +0000 Subject: 2020-10-23T12:00:01Z --- ring-overlay.html | 64 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 21 deletions(-) (limited to 'ring-overlay.html') diff --git a/ring-overlay.html b/ring-overlay.html index 61868a75428a..33aab0a61fe2 100644 --- a/ring-overlay.html +++ b/ring-overlay.html @@ -44,47 +44,69 @@ 17
$ pmaint sync ring-overlay
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            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
discouraged. You can squelch this message by running one of the following
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

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

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

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

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

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

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
or --ff-only on the command line to override the configured default per
+            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
invocation.
+            29
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            31
Already up to date.
+            31
commands sometime before your next pull:
 

-            32
*** syncing ring-overlay
+            32
 

-            33
*** synced ring-overlay
+            33
  git config pull.rebase false  # merge (the default strategy)
 

-            34
 * Sync succeeded
+            34
  git config pull.rebase true   # rebase
 

-            35
$ git log --format=%ci -1
+            35
  git config pull.ff only       # fast-forward only
 

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

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ring-overlay
+            37
You can replace "git config" with "git config --global" to set a default
 

-            38
 * Cache regenerated successfully
+            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+

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

+            40
invocation.
+

+            41
+

+            42
Already up to date.
+

+            43
*** syncing ring-overlay
+

+            44
*** synced ring-overlay
+

+            45
 * Sync succeeded
+

+            46
$ git log --format=%ci -1
+

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

+            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ring-overlay
+

+            49
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad