From 2ffb41e08c4966ad8814f3cea74105e78364fe0b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 20 Nov 2020 12:35:51 +0000 Subject: 2020-11-20T12:30:01Z --- salfter.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'salfter.html') diff --git a/salfter.html b/salfter.html index b56ed35a742a..e8323b9428ac 100644 --- a/salfter.html +++ b/salfter.html @@ -30,49 +30,51 @@ 10
$ pmaint sync salfter
- 11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            14
+            14
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            23
+            23
invocation.
 

-            24
Already up to date.
+            24
 

-            25
*** syncing salfter
+            25
Already up to date.
 

-            26
*** synced salfter
+            26
*** syncing salfter
 

-            27
 * Sync succeeded
+            27
*** synced salfter
 

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

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

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

-            31
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 salfter
+

+            32
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            32
 * Cache regen failed with 1
+            33
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad