From 5b1d0d672e2a53bed3b3c97cc73031e71b4a37b6 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Apr 2021 11:05:34 +0000 Subject: 2021-04-04T11:00:01Z --- cg.html | 54 ++++++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'cg.html') diff --git a/cg.html b/cg.html index b66def1129a6..8dbe71b5922a 100644 --- a/cg.html +++ b/cg.html @@ -28,59 +28,57 @@ 9
$ pmaint sync cg
- 10
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
*** syncing cg
 

-            11
*** syncing cg
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
commands sometime before your next pull:
 

-            14
commands sometime before your next pull:
+            14
 

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

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

-            17
  git config pull.rebase true   # rebase
+            17
  git config pull.ff only       # fast-forward only
 

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

-            19
+            19
You can replace "git config" with "git config --global" to set a default
 

-            20
You can replace "git config" with "git config --global" to set a default
+            20
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
or --ff-only on the command line to override the configured default per
 

-            22
or --ff-only on the command line to override the configured default per
+            22
invocation.
 

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** synced cg
 

-            26
*** synced cg
+            26
 * Sync succeeded
 

-            27
 * Sync succeeded
+            27
$ git log --format=%ci -1
 

-            28
$ git log --format=%ci -1
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
$ git show -q --pretty=format:%G? HEAD
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cg
 

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

-            31
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
+            30
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
 
[FATAL]
-            32
 * media-gfx/AwesomeBump-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
+            31
 * media-gfx/AwesomeBump-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
 
[FATAL]
-            33
 * media-gfx/ShipCAD-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
+            32
 * media-gfx/ShipCAD-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
 
[FATAL]
-            34
 * media-gfx/meshlab-9999-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
+            33
 * media-gfx/meshlab-9999-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line  22:  called die)
 
[FATAL]
-            35
 * media-gfx/ngplant-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            34
 * media-gfx/ngplant-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            36
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad