From 8d44376e6fdb36ee7635b4dca79a77c906e08e91 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 28 Nov 2020 20:37:06 +0000 Subject: 2020-11-28T20:30:01Z --- fusion809.html | 68 +++++++++++++++++++--------------------------------------- 1 file changed, 22 insertions(+), 46 deletions(-) (limited to 'fusion809.html') diff --git a/fusion809.html b/fusion809.html index d4d6dbdb100e..82e91f57348d 100644 --- a/fusion809.html +++ b/fusion809.html @@ -38,73 +38,49 @@ 14
$ pmaint sync fusion809
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            18
+            18
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            27
+            27
invocation.
 

-            28
From https://github.com/fusion809/fusion809-overlay
+            28
 

-            29
   3102222..1076a5f  master     -> origin/master
+            29
Already up to date.
 

-            30
Updating 3102222..1076a5f
+            30
*** syncing fusion809
 

-            31
Fast-forward
+            31
*** synced fusion809
 

-            32
 app-editors/gvim/Manifest                                               | 2 +-
+            32
 * Sync succeeded
 

-            33
 app-editors/gvim/{gvim-8.2.2063.ebuild => gvim-8.2.2065.ebuild}         | 0
+            33
$ git log --format=%ci -1
 

-            34
 app-editors/vim-core/Manifest                                           | 2 +-
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
 .../vim-core/{vim-core-8.2.2063.ebuild => vim-core-8.2.2065.ebuild}     | 0
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fusion809
 

-            36
 app-editors/vim/Manifest                                                | 2 +-
-

-            37
 app-editors/vim/{vim-8.2.2063.ebuild => vim-8.2.2065.ebuild}            | 0
-

-            38
 6 files changed, 3 insertions(+), 3 deletions(-)
-

-            39
 rename app-editors/gvim/{gvim-8.2.2063.ebuild => gvim-8.2.2065.ebuild} (100%)
-

-            40
 rename app-editors/vim-core/{vim-core-8.2.2063.ebuild => vim-core-8.2.2065.ebuild} (100%)
-

-            41
 rename app-editors/vim/{vim-8.2.2063.ebuild => vim-8.2.2065.ebuild} (100%)
-

-            42
*** syncing fusion809
-

-            43
*** synced fusion809
-

-            44
 * Sync succeeded
-

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

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

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fusion809
-

-            48
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad