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 --- johnmh.html | 64 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 21 deletions(-) (limited to 'johnmh.html') diff --git a/johnmh.html b/johnmh.html index a7aa0dd0dc7c..246977991bbf 100644 --- a/johnmh.html +++ b/johnmh.html @@ -40,47 +40,69 @@ 15
$ pmaint sync johnmh
- 16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
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).
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', 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:
+            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
+            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
  git config pull.rebase false  # merge (the default strategy)
+            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', 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
+            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.ff only       # fast-forward only
+            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

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

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

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

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

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

-            30
*** syncing johnmh
+            30
 

-            31
*** synced johnmh
+            31
  git config pull.rebase false  # merge (the default strategy)
 

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

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

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

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

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

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

+            38
invocation.
+

+            39
+

+            40
Already up to date.
+

+            41
*** syncing johnmh
+

+            42
*** synced johnmh
+

+            43
 * Sync succeeded
+

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

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

+            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 johnmh
+

+            47
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad