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

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

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

-            16
commands sometime before your next pull:
+            16
 

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

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

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

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

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

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

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

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

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

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

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

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

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

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

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

-            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
+            33
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-18-g5258