From 36a28c41a44690af636f040114416cef7cc8e943 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 30 Aug 2020 14:36:16 +0000 Subject: 2020-08-30T14:30:01Z --- hossie.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'hossie.html') diff --git a/hossie.html b/hossie.html index f6e98b519fcd..0a968b4842f0 100644 --- a/hossie.html +++ b/hossie.html @@ -28,47 +28,51 @@ 9
$ pmaint sync hossie
- 10
warning: Pulling without specifying how to reconcile divergent branches is
+            10
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).
 

-            11
discouraged. You can squelch this message by running one of the following
+            11
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).
 

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

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

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

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

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

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

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

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

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

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

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

-            23
Already up to date.
+            23
invocation.
 

-            24
*** syncing hossie
+            24
 

-            25
*** synced hossie
+            25
Already up to date.
 

-            26
 * Sync succeeded
+            26
*** syncing hossie
 

-            27
$ git log --format=%ci -1
+            27
*** synced hossie
 

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

-            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hossie
+            29
$ git log --format=%ci -1
 

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

+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hossie
+

+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad