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 --- booboo.html | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) (limited to 'booboo.html') diff --git a/booboo.html b/booboo.html index 2933bf1134fd..65f49d7cb6ca 100644 --- a/booboo.html +++ b/booboo.html @@ -32,55 +32,47 @@ 11
$ pmaint sync booboo
- 12
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).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
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).
+            13
discouraged. You can squelch this message by running one of the following
 

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

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

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

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

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

             19
 

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

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

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

-            23
+            23
invocation.
 

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

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

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

-            27
invocation.
+            27
*** synced booboo
 

-            28
+            28
 * Sync succeeded
 

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

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

-            31
*** synced booboo
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 booboo
 

-            32
 * Sync succeeded
-

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

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

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 booboo
-

-            36
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad