From b3f2008c68ea6e513fb4ea15a04577ba7451594c Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 2 Aug 2023 14:16:39 +0000 Subject: 2023-08-02T14:15:01Z --- bubba.html | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'bubba.html') diff --git a/bubba.html b/bubba.html index 14bd4ba3035a..f2d877f825b2 100644 --- a/bubba.html +++ b/bubba.html @@ -42,19 +42,59 @@ 16
*** syncing bubba
- 17
Already up to date.
+            17
From https://github.com/gordonb3/bubba-overlay
 

-            18
*** synced bubba
+            18
 + 60b636a...7334c9e master     -> origin/master  (forced update)
 

-            19
 * Sync succeeded
+            19
hint: You have divergent branches and need to specify how to reconcile them.
 

-            20
$ git log --format=%ci -1
+            20
hint: You can do so by running one of the following commands sometime before
 

-            21
$ git show -q --pretty=format:%G? HEAD
+            21
hint: your next pull:
 

-            22
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bubba
+            22
hint: 
 

-            23
 * Cache regenerated successfully
+            23
hint:   git config pull.rebase false  # merge
+

+            24
hint:   git config pull.rebase true   # rebase
+

+            25
hint:   git config pull.ff only       # fast-forward only
+

+            26
hint: 
+

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

+            28
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+

+            29
hint: or --ff-only on the command line to override the configured default per
+

+            30
hint: invocation.
+

+            31
fatal: Need to specify how to reconcile divergent branches.
+

+            32
!!! failed syncing bubba
+

+            33
 * Sync failed with 1
+
[FATAL]
+            34
 * Will try to re-create
+

+            35
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba
+

+            36
*** syncing bubba
+

+            37
Cloning into '/var/lib/repo-mirror-ci/sync/bubba'...
+

+            38
*** synced bubba
+

+            39
 * Sync succeeded after re-adding
+

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

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

+            42
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bubba
+

+            43
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad