From 0b9bc67d2ece655ca1458df50a42a36b82385bf4 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 24 Nov 2020 20:35:13 +0000 Subject: 2020-11-24T20:30:01Z --- calculate.html | 76 ++++++++++++++++------------------------------------------ 1 file changed, 21 insertions(+), 55 deletions(-) (limited to 'calculate.html') diff --git a/calculate.html b/calculate.html index 134a85c832a2..99265f4aa178 100644 --- a/calculate.html +++ b/calculate.html @@ -28,81 +28,47 @@ 9
$ pmaint sync calculate
- 10
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).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
From git://git.calculate-linux.org/calculate/calculate-overlay
+            24
*** syncing calculate
 

-            25
   f33074bdc..200226a6f  master     -> origin/master
+            25
*** synced calculate
 

-            26
   f33074bdc..200226a6f  master64   -> origin/master64
+            26
 * Sync succeeded
 

-            27
 * [new tag]             2264       -> 2264
+            27
$ git log --format=%ci -1
 

-            28
Updating f33074bdc..200226a6f
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
Fast-forward
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
 

-            30
 .../fix_import_error_exit_code.patch               |  7 ++++++
-

-            31
 .../profile.bashrc.d/50-post-setup-package         | 24 +++++++++++++++++++-
-

-            32
 .../profile.bashrc.d/50-setup-package              |  9 +++++++-
-

-            33
 .../templates/3.6/6_ac_update_sync/remerge/0-ini   |  2 +-
-

-            34
 .../3.6/6_ac_update_sync/remerge/2020/20201124     |  4 ++++
-

-            35
 sys-apps/calculate-utils/Manifest                  |  1 +
-

-            36
 .../calculate-utils-3.6.8.15.ebuild                | 26 ++++++++++++++++++++++
-

-            37
 7 files changed, 70 insertions(+), 3 deletions(-)
-

-            38
 create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/fix_import_error_exit_code.patch
-

-            39
 create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2020/20201124
-

-            40
 create mode 100644 sys-apps/calculate-utils/calculate-utils-3.6.8.15.ebuild
-

-            41
*** syncing calculate
-

-            42
*** synced calculate
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
-

-            47
 * Cache regenerated successfully
+            30
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad