From 2f4d382af28bb9a42e0203cc2dcfd02491f3a61f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 26 Jul 2024 16:18:55 +0000 Subject: 2024-07-26T16:15:00Z --- blackburn29.html | 54 +++++++----------------------------------------------- 1 file changed, 7 insertions(+), 47 deletions(-) (limited to 'blackburn29.html') diff --git a/blackburn29.html b/blackburn29.html index a538e43f2e6c..9f8c47df87f3 100644 --- a/blackburn29.html +++ b/blackburn29.html @@ -44,59 +44,19 @@ 17
*** syncing blackburn29
- 18
From https://github.com/blackburn29/blackburn29-overlay
+            18
Already up to date.
 

-            19
 + 6a2de5a...708041b master     -> origin/master  (forced update)
+            19
*** synced blackburn29
 

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

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

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

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

-            24
hint:   git config pull.rebase false  # merge
-

-            25
hint:   git config pull.rebase true   # rebase
-

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

-            27
hint:
-

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

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

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

-            31
hint: invocation.
-

-            32
fatal: Need to specify how to reconcile divergent branches.
-

-            33
!!! failed syncing blackburn29
-

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

-            36
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync blackburn29
-

-            37
*** syncing blackburn29
-

-            38
Cloning into '/var/lib/repo-mirror-ci/sync/blackburn29'...
-

-            39
*** synced blackburn29
-

-            40
 * Sync succeeded after re-adding
-

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

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

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

-            44
 * Cache regenerated successfully
+            24
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad