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 --- cg.html | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'cg.html') diff --git a/cg.html b/cg.html index 5313a2bfbd6c..efe67b75a91e 100644 --- a/cg.html +++ b/cg.html @@ -28,49 +28,55 @@ 9
$ pmaint sync cg
- 10
warning: Pulling without specifying how to reconcile divergent branches is
+            10
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).
 

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

-            12
commands sometime before your next pull:
+            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
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
  git config pull.rebase false  # merge (the default strategy)
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
  git config pull.rebase true   # rebase
+            15
commands sometime before your next pull:
 

-            16
  git config pull.ff only       # fast-forward only
+            16
 

-            17
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
You can replace "git config" with "git config --global" to set a default
+            18
  git config pull.rebase true   # rebase
 

-            19
preference for all repositories. You can also pass --rebase, --no-rebase,
+            19
  git config pull.ff only       # fast-forward only
 

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

-            21
invocation.
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
Already up to date.
+            23
or --ff-only on the command line to override the configured default per
 

-            24
*** syncing cg
+            24
invocation.
 

-            25
*** synced cg
+            25
 

-            26
 * Sync succeeded
+            26
Already up to date.
 

-            27
$ git log --format=%ci -1
+            27
*** syncing cg
 

-            28
$ git show -q --pretty=format:%G? HEAD
+            28
*** synced cg
 

-            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cg
+            29
 * Sync succeeded
 

-            30
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
+            30
$ git log --format=%ci -1
+

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

+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cg
+

+            33
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
 
[FATAL]
-            31
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad