From e33cd2177cdc87b735a38a633f638b6c1b13e406 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:06:50 +0000 Subject: 2020-10-23T13:00:01Z --- ennui.html | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'ennui.html') diff --git a/ennui.html b/ennui.html index 1b94b9b16c9d..a802fb8b1348 100644 --- a/ennui.html +++ b/ennui.html @@ -40,53 +40,47 @@ 15
$ pmaint sync ennui
- 16
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
commands sometime before your next pull:
+            21
  git config pull.rebase true   # rebase
 

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

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

-            24
  git config pull.rebase true   # rebase
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
  git config pull.ff only       # fast-forward only
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
+            26
or --ff-only on the command line to override the configured default per
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
invocation.
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
 

-            29
or --ff-only on the command line to override the configured default per
+            29
Already up to date.
 

-            30
invocation.
+            30
*** syncing ennui
 

-            31
+            31
*** synced ennui
 

-            32
Already up to date.
+            32
 * Sync succeeded
 

-            33
*** syncing ennui
+            33
$ git log --format=%ci -1
 

-            34
*** synced ennui
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
 * Sync succeeded
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
 

-            36
$ git log --format=%ci -1
-

-            37
$ git show -q --pretty=format:%G? HEAD
-

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
-

-            39
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad