From d7f328656ae7932de1ca24dc281e632803d8a943 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 20 Nov 2020 17:05:17 +0000 Subject: 2020-11-20T17:00:01Z --- guru.html | 114 ++++++++++++-------------------------------------------------- 1 file changed, 22 insertions(+), 92 deletions(-) (limited to 'guru.html') diff --git a/guru.html b/guru.html index a5db0fd1c463..714eb3f44bef 100644 --- a/guru.html +++ b/guru.html @@ -36,119 +36,49 @@ 13
$ pmaint sync guru
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
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).
 

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

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

-            17
+            17
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            26
+            26
invocation.
 

-            27
From https://anongit.gentoo.org/git/repo/proj/guru
+            27
 

-            28
   c3f0b79..d80dda2  master     -> origin/master
+            28
Already up to date.
 

-            29
   829b51d..d80dda2  dev        -> origin/dev
+            29
*** syncing guru
 

-            30
Updating c3f0b79..d80dda2
+            30
*** synced guru
 

-            31
Fast-forward
+            31
 * Sync succeeded
 

-            32
 app-office/pyspread/Manifest                       |  2 +-
+            32
$ git log --format=%ci -1
 

-            33
 ...ead-1.99.2-r1.ebuild => pyspread-1.99.5.ebuild} |  0
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
 dev-python/backrefs/Manifest                       |  2 +-
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
 

-            35
 dev-python/backrefs/backrefs-4.3.0.ebuild          | 34 ------------
-

-            36
 dev-python/backrefs/backrefs-4.5.0.ebuild          | 45 +++++++++++++++
-

-            37
 dev-python/jupyter-sphinx/Manifest                 |  2 +-
-

-            38
 ...nx-0.2.4.ebuild => jupyter-sphinx-0.3.2.ebuild} |  4 +-
-

-            39
 dev-python/markdown-include/Manifest               |  2 +-
-

-            40
 ...-0.5.1.ebuild => markdown-include-0.6.0.ebuild} |  2 +-
-

-            41
 dev-python/mkdocs-material/Manifest                |  3 +-
-

-            42
 .../mkdocs-material/mkdocs-material-4.6.3.ebuild   | 30 ----------
-

-            43
 ...l-6.1.0.ebuild => mkdocs-material-6.1.5.ebuild} |  0
-

-            44
 dev-python/timeout-decorator/Manifest              |  2 +-
-

-            45
 ...0.4.1.ebuild => timeout-decorator-0.5.0.ebuild} |  2 +-
-

-            46
 games-action/minecraft-launcher/Manifest           |  1 +
-

-            47
 .../minecraft-launcher-2.2.548_beta.ebuild         | 64 ++++++++++++++++++++++
-

-            48
 games-action/technic-launcher/Manifest             |  2 +-
-

-            49
 ...-4.603.ebuild => technic-launcher-4.607.ebuild} |  0
-

-            50
 media-libs/amdvlk/Manifest                         |  8 +--
-

-            51
 ...dvlk-2020.4.4.ebuild => amdvlk-2020.4.5.ebuild} | 24 ++------
-

-            52
 20 files changed, 131 insertions(+), 98 deletions(-)
-

-            53
 rename app-office/pyspread/{pyspread-1.99.2-r1.ebuild => pyspread-1.99.5.ebuild} (100%)
-

-            54
 delete mode 100644 dev-python/backrefs/backrefs-4.3.0.ebuild
-

-            55
 create mode 100644 dev-python/backrefs/backrefs-4.5.0.ebuild
-

-            56
 rename dev-python/jupyter-sphinx/{jupyter-sphinx-0.2.4.ebuild => jupyter-sphinx-0.3.2.ebuild} (85%)
-

-            57
 rename dev-python/markdown-include/{markdown-include-0.5.1.ebuild => markdown-include-0.6.0.ebuild} (92%)
-

-            58
 delete mode 100644 dev-python/mkdocs-material/mkdocs-material-4.6.3.ebuild
-

-            59
 rename dev-python/mkdocs-material/{mkdocs-material-6.1.0.ebuild => mkdocs-material-6.1.5.ebuild} (100%)
-

-            60
 rename dev-python/timeout-decorator/{timeout-decorator-0.4.1.ebuild => timeout-decorator-0.5.0.ebuild} (91%)
-

-            61
 create mode 100644 games-action/minecraft-launcher/minecraft-launcher-2.2.548_beta.ebuild
-

-            62
 rename games-action/technic-launcher/{technic-launcher-4.603.ebuild => technic-launcher-4.607.ebuild} (100%)
-

-            63
 rename media-libs/amdvlk/{amdvlk-2020.4.4.ebuild => amdvlk-2020.4.5.ebuild} (87%)
-

-            64
*** syncing guru
-

-            65
*** synced guru
-

-            66
 * Sync succeeded
-

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

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

-            69
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
-

-            70
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad