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 --- sspreitz.html | 68 +++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 21 deletions(-) (limited to 'sspreitz.html') diff --git a/sspreitz.html b/sspreitz.html index 69733994f1ce..2b1876eda192 100644 --- a/sspreitz.html +++ b/sspreitz.html @@ -42,47 +42,73 @@ 16
$ pmaint sync sspreitz
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
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).
 

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

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

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

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

-            22
  git config pull.rebase true   # rebase
+            22
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).
 

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

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

-            25
You can replace "git config" with "git config --global" to set a default
+            25
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).
 

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

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

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

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

-            30
Already up to date.
+            30
warning: Pulling without specifying how to reconcile divergent branches is
 

-            31
*** syncing sspreitz
+            31
discouraged. You can squelch this message by running one of the following
 

-            32
*** synced sspreitz
+            32
commands sometime before your next pull:
 

-            33
 * Sync succeeded
+            33
 

-            34
$ git log --format=%ci -1
+            34
  git config pull.rebase false  # merge (the default strategy)
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
  git config pull.rebase true   # rebase
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sspreitz
+            36
  git config pull.ff only       # fast-forward only
 

-            37
 * Cache regenerated successfully
+            37
+

+            38
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
or --ff-only on the command line to override the configured default per
+

+            41
invocation.
+

+            42
+

+            43
Already up to date.
+

+            44
*** syncing sspreitz
+

+            45
*** synced sspreitz
+

+            46
 * Sync succeeded
+

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

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

+            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sspreitz
+

+            50
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad