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 --- np-hardass-overlay.html | 62 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 21 deletions(-) (limited to 'np-hardass-overlay.html') diff --git a/np-hardass-overlay.html b/np-hardass-overlay.html index 817f9d4f3662..d5c77a1ddc4b 100644 --- a/np-hardass-overlay.html +++ b/np-hardass-overlay.html @@ -32,47 +32,67 @@ 11
$ pmaint sync np-hardass-overlay
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
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).
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
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).
 

-            14
commands sometime before your next pull:
+            14
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).
 

-            15
+            15
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).
 

-            16
  git config pull.rebase false  # merge (the default strategy)
+            16
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).
 

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

-            18
  git config pull.ff only       # fast-forward only
+            18
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).
 

-            19
+            19
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).
 

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

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
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).
 

-            22
or --ff-only on the command line to override the configured default per
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            24
+            24
commands sometime before your next pull:
 

-            25
Already up to date.
+            25
 

-            26
*** syncing np-hardass-overlay
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
*** synced np-hardass-overlay
+            27
  git config pull.rebase true   # rebase
 

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

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

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 np-hardass-overlay
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
 * Cache regenerated successfully
+            32
or --ff-only on the command line to override the configured default per
+

+            33
invocation.
+

+            34
+

+            35
Already up to date.
+

+            36
*** syncing np-hardass-overlay
+

+            37
*** synced np-hardass-overlay
+

+            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 np-hardass-overlay
+

+            42
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad