From d255581ec728aabf0a7393b5f1d707c57b4eba31 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 12 Jan 2021 14:34:56 +0000 Subject: 2021-01-12T14:30:01Z --- stuff.html | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'stuff.html') diff --git a/stuff.html b/stuff.html index c14e7c921cba..eaa6e140bfbd 100644 --- a/stuff.html +++ b/stuff.html @@ -28,57 +28,55 @@ 9
$ pmaint sync stuff
- 10
WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

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

-            25
*** syncing stuff
+            25
*** synced stuff
 

-            26
*** synced stuff
+            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 1 stuff
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stuff
-

-            31
 * app-office/mytetra-1.44.28: failed sourcing ebuild: EAPI=6 is not supported
+            30
 * app-office/mytetra-1.44.28: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            32
 * app-office/mytetra-1.44.55: failed sourcing ebuild: EAPI=6 is not supported
+            31
 * app-office/mytetra-1.44.55: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            33
 * app-office/mytetra-9999: failed sourcing ebuild: EAPI=6 is not supported
+            32
 * app-office/mytetra-9999: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            34
 * x11-terms/cool-retro-term-9999: failed sourcing ebuild: EAPI=6 is not supported
+            33
 * x11-terms/cool-retro-term-9999: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            35
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad