From 8fc0b36519bab0c859d80f139bc0c8715e865c7e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 12:36:44 +0000 Subject: 2020-10-23T12:00:01Z --- benzene-overlay.html | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'benzene-overlay.html') diff --git a/benzene-overlay.html b/benzene-overlay.html index 8360fbed1fff..0b8ab80ecfcb 100644 --- a/benzene-overlay.html +++ b/benzene-overlay.html @@ -38,47 +38,55 @@ 14
$ pmaint sync benzene-overlay
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
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).
 

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

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

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

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

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

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

             22
 

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

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

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

-            26
invocation.
+            26
 

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

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

-            29
*** syncing benzene-overlay
+            29
or --ff-only on the command line to override the configured default per
 

-            30
*** synced benzene-overlay
+            30
invocation.
 

-            31
 * Sync succeeded
+            31
 

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

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
*** syncing benzene-overlay
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 benzene-overlay
+            34
*** synced benzene-overlay
 

-            35
 * Cache regenerated successfully
+            35
 * Sync succeeded
+

+            36
$ git log --format=%ci -1
+

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

+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 benzene-overlay
+

+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad