From a80d660a820f16430cbf26b999248c72eac8d29f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 1 Oct 2020 09:35:05 +0000 Subject: 2020-10-01T09:30:01Z --- dev1990-overlay.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'dev1990-overlay.html') diff --git a/dev1990-overlay.html b/dev1990-overlay.html index 837ff7b6079b..8c560260dbec 100644 --- a/dev1990-overlay.html +++ b/dev1990-overlay.html @@ -34,47 +34,49 @@ 12
$ pmaint sync dev1990-overlay
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            16
+            16
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            25
+            25
invocation.
 

-            26
Already up to date.
+            26
 

-            27
*** syncing dev1990-overlay
+            27
Already up to date.
 

-            28
*** synced dev1990-overlay
+            28
*** syncing dev1990-overlay
 

-            29
 * Sync succeeded
+            29
*** synced dev1990-overlay
 

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

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

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

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

+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad