From 370d35d0e0684f049de56bb3a9f762cb20671c07 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 5 Oct 2020 21:05:18 +0000 Subject: 2020-10-05T21:00:01Z --- beatussum-overlay.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'beatussum-overlay.html') diff --git a/beatussum-overlay.html b/beatussum-overlay.html index 1d3dac4b261e..afda074ded45 100644 --- a/beatussum-overlay.html +++ b/beatussum-overlay.html @@ -58,47 +58,49 @@ 24
$ pmaint sync beatussum-overlay
- 25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            28
+            28
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            37
+            37
invocation.
 

-            38
Already up to date.
+            38
 

-            39
*** syncing beatussum-overlay
+            39
Already up to date.
 

-            40
*** synced beatussum-overlay
+            40
*** syncing beatussum-overlay
 

-            41
 * Sync succeeded
+            41
*** synced beatussum-overlay
 

-            42
$ git log --format=%ci -1
+            42
 * Sync succeeded
 

-            43
$ git show -q --pretty=format:%G? HEAD
+            43
$ git log --format=%ci -1
 

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 beatussum-overlay
+            44
$ git show -q --pretty=format:%G? HEAD
 

-            45
 * Cache regenerated successfully
+            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 beatussum-overlay
+

+            46
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad