From 5fda5e13a3d4efdc83006cbae32df95ba5b82dc5 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 29 Jan 2021 07:34:43 +0000 Subject: 2021-01-29T07:00:01Z --- stuff.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'stuff.html') diff --git a/stuff.html b/stuff.html index f8bc51480919..6bcda7cb02ac 100644 --- a/stuff.html +++ b/stuff.html @@ -30,49 +30,51 @@ 10
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
- 11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            14
+            14
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            23
+            23
invocation.
 

-            24
Already up to date.
+            24
 

-            25
*** syncing stuff
+            25
Already up to date.
 

-            26
*** synced stuff
+            26
*** syncing stuff
 

-            27
 * Sync succeeded
+            27
*** synced stuff
 

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

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

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stuff
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
 * media-gfx/wkhtmltopdf: failed parsing metadata.xml: XML declaration allowed only at the start of the document, line 1, column 7 (metadata.xml, line 1)
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stuff
+

+            32
 * media-gfx/wkhtmltopdf: failed parsing metadata.xml: XML declaration allowed only at the start of the document, line 1, column 7 (metadata.xml, line 1)
 
[FATAL]
-            32
 * Cache regen failed with 1
+            33
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad