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 --- fem-overlay.html | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'fem-overlay.html') diff --git a/fem-overlay.html b/fem-overlay.html index dafc0402ba68..11303b7670db 100644 --- a/fem-overlay.html +++ b/fem-overlay.html @@ -32,53 +32,47 @@ 11
$ pmaint sync fem-overlay
- 12
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).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
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).
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
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).
+            14
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

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

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

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

-            26
invocation.
+            26
*** syncing fem-overlay
 

-            27
+            27
*** synced fem-overlay
 

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

-            29
*** syncing fem-overlay
+            29
$ git log --format=%ci -1
 

-            30
*** synced fem-overlay
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
 * Sync succeeded
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fem-overlay
 

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fem-overlay
-

-            35
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad