From 48572c4f5133a77a965d6c1a4d4af41ecae1bb0a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 29 Oct 2020 07:53:33 +0000 Subject: 2020-10-29T07:30:01Z --- yuzu-overlay.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'yuzu-overlay.html') diff --git a/yuzu-overlay.html b/yuzu-overlay.html index 630845b656d2..cd8846204142 100644 --- a/yuzu-overlay.html +++ b/yuzu-overlay.html @@ -44,47 +44,51 @@ 17
$ pmaint sync yuzu-overlay
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
WARNING:pkgcore:k_f repo at '/var/lib/repo-mirror-ci/sync/k_f', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

-            20
commands sometime before your next pull:
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
commands sometime before your next pull:
 

-            23
  git config pull.rebase true   # rebase
+            23
 

-            24
  git config pull.ff only       # fast-forward only
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
+            25
  git config pull.rebase true   # rebase
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
  git config pull.ff only       # fast-forward only
 

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

-            28
or --ff-only on the command line to override the configured default per
+            28
You can replace "git config" with "git config --global" to set a default
 

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

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

-            31
Already up to date.
+            31
invocation.
 

-            32
*** syncing yuzu-overlay
+            32
 

-            33
*** synced yuzu-overlay
+            33
Already up to date.
 

-            34
 * Sync succeeded
+            34
*** syncing yuzu-overlay
 

-            35
$ git log --format=%ci -1
+            35
*** synced yuzu-overlay
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
 * Sync succeeded
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yuzu-overlay
+            37
$ git log --format=%ci -1
 

-            38
 * Cache regenerated successfully
+            38
$ git show -q --pretty=format:%G? HEAD
+

+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yuzu-overlay
+

+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad