From e33cd2177cdc87b735a38a633f638b6c1b13e406 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:06:50 +0000 Subject: 2020-10-23T13:00:01Z --- bumblebee.html | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) (limited to 'bumblebee.html') diff --git a/bumblebee.html b/bumblebee.html index 537481f9b64b..c664d76eaf3f 100644 --- a/bumblebee.html +++ b/bumblebee.html @@ -34,55 +34,47 @@ 12
$ pmaint sync bumblebee
- 13
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            15
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).
+            15
commands sometime before your next pull:
 

-            16
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).
+            16
 

-            17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
  git config pull.rebase true   # rebase
 

-            19
commands sometime before your next pull:
+            19
  git config pull.ff only       # fast-forward only
 

             20
 

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
  git config pull.rebase true   # rebase
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
  git config pull.ff only       # fast-forward only
+            23
or --ff-only on the command line to override the configured default per
 

-            24
+            24
invocation.
 

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

-            26
preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
Already up to date.
 

-            27
or --ff-only on the command line to override the configured default per
+            27
*** syncing bumblebee
 

-            28
invocation.
+            28
*** synced bumblebee
 

-            29
+            29
 * Sync succeeded
 

-            30
Already up to date.
+            30
$ git log --format=%ci -1
 

-            31
*** syncing bumblebee
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
*** synced bumblebee
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bumblebee
 

-            33
 * Sync succeeded
-

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

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bumblebee
-

-            37
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad