From 0cf2cacae76ba30ac49bc60f08e2a6785aabed6b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 14 Nov 2020 16:05:14 +0000 Subject: 2020-11-14T16:00:01Z --- jorgicio.html | 84 ++++++++++++++++++++++------------------------------------- 1 file changed, 31 insertions(+), 53 deletions(-) (limited to 'jorgicio.html') diff --git a/jorgicio.html b/jorgicio.html index 5de50f74ea79..790e8bb5cbf0 100644 --- a/jorgicio.html +++ b/jorgicio.html @@ -42,87 +42,65 @@ 16
$ pmaint sync jorgicio
- 17
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            20
commands sometime before your next pull:
+            20
 

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
 

-            30
+            30
From https://github.com/jorgicio/jorgicio-gentoo
 

-            31
From https://github.com/jorgicio/jorgicio-gentoo
+            31
 * [new branch]        main       -> origin/main
 

-            32
   56caf3a6..6f25a1b6  master     -> origin/master
+            32
Your configuration specifies to merge with the ref 'refs/heads/master'
 

-            33
Updating 56caf3a6..6f25a1b6
+            33
from the remote, but no such ref was fetched.
 

-            34
Fast-forward
+            34
*** syncing jorgicio
 

-            35
 dev-util/heroku-cli/Manifest                       | 16 ++---------
+            35
!!! failed syncing jorgicio
 

-            36
 dev-util/heroku-cli/heroku-cli-7.42.1.ebuild       | 31 ----------------------
+            36
 * Sync failed with 1
+
[FATAL]
+            37
 * Will try to re-create
 

-            37
 dev-util/heroku-cli/heroku-cli-7.42.13.ebuild      | 31 ----------------------
+            38
$ pmaint sync jorgicio
 

-            38
 dev-util/heroku-cli/heroku-cli-7.42.4.ebuild       | 31 ----------------------
+            39
Cloning into '/var/lib/repo-mirror-ci/sync/jorgicio'...
 

-            39
 dev-util/heroku-cli/heroku-cli-7.42.5.ebuild       | 31 ----------------------
+            40
*** syncing jorgicio
 

-            40
 dev-util/heroku-cli/heroku-cli-7.42.6.ebuild       | 31 ----------------------
+            41
*** synced jorgicio
 

-            41
 dev-util/heroku-cli/heroku-cli-7.44.0.ebuild       | 31 ----------------------
+            42
 * Sync succeeded after re-adding
 

-            42
 ...-cli-7.41.1.ebuild => heroku-cli-7.47.2.ebuild} |  0
+            43
$ git log --format=%ci -1
 

-            43
 8 files changed, 2 insertions(+), 200 deletions(-)
+            44
$ git show -q --pretty=format:%G? HEAD
 

-            44
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.42.1.ebuild
+            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio
 

-            45
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.42.13.ebuild
-

-            46
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.42.4.ebuild
-

-            47
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.42.5.ebuild
-

-            48
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.42.6.ebuild
-

-            49
 delete mode 100644 dev-util/heroku-cli/heroku-cli-7.44.0.ebuild
-

-            50
 rename dev-util/heroku-cli/{heroku-cli-7.41.1.ebuild => heroku-cli-7.47.2.ebuild} (100%)
-

-            51
*** syncing jorgicio
-

-            52
*** synced jorgicio
-

-            53
 * Sync succeeded
-

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

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

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio
-

-            57
 * Cache regenerated successfully
+            46
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad