From c8368258824b076c171fe25f0001200f1626c843 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 15:07:24 +0000 Subject: 2020-10-23T14:30:01Z --- bobwya.html | 68 ++++++++++++++++++++++++++----------------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) (limited to 'bobwya.html') diff --git a/bobwya.html b/bobwya.html index 0da45b3cc4bc..c9873911f878 100644 --- a/bobwya.html +++ b/bobwya.html @@ -42,75 +42,65 @@ 16
$ pmaint sync bobwya
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
commands sometime before your next pull:
+            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
+            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
  git config pull.rebase true   # rebase
+            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
  git config pull.ff only       # fast-forward only
+            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
+            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
You can replace "git config" with "git config --global" to set a default
+            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
warning: Pulling without specifying how to reconcile divergent branches is
 

-            27
or --ff-only on the command line to override the configured default per
+            27
discouraged. You can squelch this message by running one of the following
 

-            28
invocation.
+            28
commands sometime before your next pull:
 

             29
 

-            30
From https://github.com/bobwya/miscellaneous_ebuilds
+            30
  git config pull.rebase false  # merge (the default strategy)
 

-            31
   4b351fa..47700d4  master     -> origin/master
+            31
  git config pull.rebase true   # rebase
 

-            32
Updating 4b351fa..47700d4
+            32
  git config pull.ff only       # fast-forward only
 

-            33
Fast-forward
+            33
 

-            34
 app-benchmarks/phoronix-test-suite/Manifest        |    8 +-
+            34
You can replace "git config" with "git config --global" to set a default
 

-            35
 ...e2.ebuild => phoronix-test-suite-10.0.0.ebuild} |    0
+            35
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            36
 ...e3.ebuild => phoronix-test-suite-10.0.1.ebuild} |    0
+            36
or --ff-only on the command line to override the configured default per
 

-            37
 www-client/firefox/Manifest                        |  200 ++++
+            37
invocation.
 

-            38
 www-client/firefox/firefox-78.4.0.ebuild           | 1175 ++++++++++++++++++++
+            38
 

-            39
 www-client/firefox/firefox-82.0.ebuild             | 1175 ++++++++++++++++++++
+            39
Already up to date.
 

-            40
 6 files changed, 2554 insertions(+), 4 deletions(-)
+            40
*** syncing bobwya
 

-            41
 rename app-benchmarks/phoronix-test-suite/{phoronix-test-suite-10.0.0_pre2.ebuild => phoronix-test-suite-10.0.0.ebuild} (100%)
+            41
*** synced bobwya
 

-            42
 rename app-benchmarks/phoronix-test-suite/{phoronix-test-suite-10.0.0_pre3.ebuild => phoronix-test-suite-10.0.1.ebuild} (100%)
+            42
 * Sync succeeded
 

-            43
 create mode 100644 www-client/firefox/firefox-78.4.0.ebuild
+            43
$ git log --format=%ci -1
 

-            44
 create mode 100644 www-client/firefox/firefox-82.0.ebuild
+            44
$ git show -q --pretty=format:%G? HEAD
 

-            45
*** syncing bobwya
+            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bobwya
 

-            46
*** synced bobwya
-

-            47
 * Sync succeeded
-

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

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

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bobwya
-

-            51
 * Cache regenerated successfully
+            46
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad