From ad730eb5c99fe55ff23bea3b69f18fc02a3424f9 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 13 Dec 2020 21:05:03 +0000 Subject: 2020-12-13T21:00:01Z --- causelay.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'causelay.html') diff --git a/causelay.html b/causelay.html index 1c3110349451..a93367e7903c 100644 --- a/causelay.html +++ b/causelay.html @@ -34,49 +34,51 @@ 12
$ pmaint sync causelay
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            16
+            16
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            25
+            25
invocation.
 

-            26
Already up to date.
+            26
 

-            27
*** syncing causelay
+            27
Already up to date.
 

-            28
*** synced causelay
+            28
*** syncing causelay
 

-            29
 * Sync succeeded
+            29
*** synced causelay
 

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

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

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

-            33
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 causelay
+

+            34
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            34
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad