From 54f8023f655ab4701d69023c6dc84e95b0c6bde8 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 30 Nov 2020 23:05:24 +0000 Subject: 2020-11-30T23:00:01Z --- megacoffee.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'megacoffee.html') diff --git a/megacoffee.html b/megacoffee.html index 17611efe60bb..5d5fed815618 100644 --- a/megacoffee.html +++ b/megacoffee.html @@ -56,47 +56,49 @@ 23
$ pmaint sync megacoffee
- 24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            27
+            27
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            36
+            36
invocation.
 

-            37
Already up to date.
+            37
 

-            38
*** syncing megacoffee
+            38
Already up to date.
 

-            39
*** synced megacoffee
+            39
*** syncing megacoffee
 

-            40
 * Sync succeeded
+            40
*** synced megacoffee
 

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

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

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

-            44
 * Cache regenerated successfully
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 megacoffee
+

+            45
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad