From bed4b55db1b1dfa0f39c77fc87add7cc1fb81502 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 10 Jan 2021 16:35:11 +0000 Subject: 2021-01-10T16:30:01Z --- sublime-text.html | 58 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'sublime-text.html') diff --git a/sublime-text.html b/sublime-text.html index 44237a803002..1337b95cad63 100644 --- a/sublime-text.html +++ b/sublime-text.html @@ -44,61 +44,63 @@ 17
$ pmaint sync sublime-text
- 18
WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            22
+            22
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            31
+            31
invocation.
 

-            32
Already up to date.
+            32
 

-            33
*** syncing sublime-text
+            33
Already up to date.
 

-            34
*** synced sublime-text
+            34
*** syncing sublime-text
 

-            35
 * Sync succeeded
+            35
*** synced sublime-text
 

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

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

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

-            39
 * app-editors/sublime-text-2.0.1: failed sourcing ebuild: EAPI=4 is not supported
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sublime-text
+

+            40
 * app-editors/sublime-text-2.0.1: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            40
 * app-editors/sublime-text-2.0.2: failed sourcing ebuild: EAPI=4 is not supported
+            41
 * app-editors/sublime-text-2.0.2: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            41
 * app-editors/sublime-text-3033: failed sourcing ebuild: EAPI=4 is not supported
+            42
 * app-editors/sublime-text-3033: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            42
 * app-editors/sublime-text-3047: failed sourcing ebuild: EAPI=4 is not supported
+            43
 * app-editors/sublime-text-3047: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            43
 * app-editors/sublime-text-3059: failed sourcing ebuild: EAPI=4 is not supported
+            44
 * app-editors/sublime-text-3059: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            44
 * app-editors/sublime-text-3065: failed sourcing ebuild: EAPI=4 is not supported
+            45
 * app-editors/sublime-text-3065: failed sourcing ebuild: EAPI=4 is not supported
 
[FATAL]
-            45
 * Cache regen failed with 1
+            46
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad