From b8fdc4eeace47c6ea1dd8cb8c0cd1503a6f2374a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 14 Jan 2021 13:06:36 +0000 Subject: 2021-01-14T13:00:01Z --- flewkey-overlay.html | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) (limited to 'flewkey-overlay.html') diff --git a/flewkey-overlay.html b/flewkey-overlay.html index 4fc9a26ec4e1..168d7ff250aa 100644 --- a/flewkey-overlay.html +++ b/flewkey-overlay.html @@ -30,29 +30,51 @@ 10
 'status': 'unofficial'}
- 11
 * Adding new repository
+            11
$ pmaint sync flewkey-overlay
 

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

-            13
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', 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:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', 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
Cloning into '/var/lib/repo-mirror-ci/sync/flewkey-overlay'...
+            15
commands sometime before your next pull:
 

-            16
*** syncing flewkey-overlay
+            16
 

-            17
*** synced flewkey-overlay
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
 * Sync succeeded
+            18
  git config pull.rebase true   # rebase
 

-            19
$ git log --format=%ci -1
+            19
  git config pull.ff only       # fast-forward only
 

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

-            21
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flewkey-overlay
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
 * Cache regenerated successfully
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+

+            23
or --ff-only on the command line to override the configured default per
+

+            24
invocation.
+

+            25
+

+            26
Already up to date.
+

+            27
*** syncing flewkey-overlay
+

+            28
*** synced flewkey-overlay
+

+            29
 * Sync succeeded
+

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

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

+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flewkey-overlay
+

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad