From 37aadebc05c56fc3b275eafa0d0efd6c78ac646d Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 9 Mar 2021 00:20:39 +0000 Subject: 2021-03-09T00:15:01Z --- genthree.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'genthree.html') diff --git a/genthree.html b/genthree.html index a44593ef08e8..43665f82f3b2 100644 --- a/genthree.html +++ b/genthree.html @@ -32,49 +32,51 @@ 11
$ pmaint sync genthree
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            15
+            15
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            24
+            24
invocation.
 

-            25
Already up to date.
+            25
 

-            26
*** syncing genthree
+            26
Already up to date.
 

-            27
*** synced genthree
+            27
*** syncing genthree
 

-            28
 * Sync succeeded
+            28
*** synced genthree
 

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

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

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

-            32
 * app-crypt/certbot-dns-rfc2136-0.36.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 genthree
+

+            33
 * app-crypt/certbot-dns-rfc2136-0.36.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            33
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad