From e6dc5c519d408ed7a35c088b9b2236a4434db744 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 4 Dec 2024 00:52:41 +0000 Subject: 2024-12-04T00:45:00Z --- tatsh-overlay.html | 52 ++++++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) (limited to 'tatsh-overlay.html') diff --git a/tatsh-overlay.html b/tatsh-overlay.html index 55b2ffeed720..f97f8a0f9df2 100644 --- a/tatsh-overlay.html +++ b/tatsh-overlay.html @@ -46,57 +46,41 @@ 18
From https://github.com/Tatsh/tatsh-overlay
- 19
 + ab005c0c...0c80a3bc master     -> origin/master  (forced update)
+            19
   0c80a3bc..f502885c  master     -> origin/master
 

-            20
hint: You have divergent branches and need to specify how to reconcile them.
+            20
Updating 0c80a3bc..f502885c
 

-            21
hint: You can do so by running one of the following commands sometime before
+            21
Fast-forward
 

-            22
hint: your next pull:
+            22
 dev-python/curl-cffi/Manifest                      |  4 +++
 

-            23
hint:
+            23
 dev-python/curl-cffi/curl-cffi-0.7.3.ebuild        | 24 +++++++++++++++
 

-            24
hint:   git config pull.rebase false  # merge
+            24
 .../files/curl-cffi-0001-system-libs.patch         | 35 ++++++++++++++++++++++
 

-            25
hint:   git config pull.rebase true   # rebase
+            25
 dev-python/curl-cffi/metadata.xml                  | 11 +++++++
 

-            26
hint:   git config pull.ff only       # fast-forward only
+            26
 4 files changed, 74 insertions(+)
 

-            27
hint:
+            27
 create mode 100644 dev-python/curl-cffi/Manifest
 

-            28
hint: You can replace "git config" with "git config --global" to set a default
+            28
 create mode 100644 dev-python/curl-cffi/curl-cffi-0.7.3.ebuild
 

-            29
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
 create mode 100644 dev-python/curl-cffi/files/curl-cffi-0001-system-libs.patch
 

-            30
hint: or --ff-only on the command line to override the configured default per
+            30
 create mode 100644 dev-python/curl-cffi/metadata.xml
 

-            31
hint: invocation.
+            31
*** synced tatsh-overlay
 

-            32
fatal: Need to specify how to reconcile divergent branches.
+            32
 * Sync succeeded
 

-            33
!!! failed syncing tatsh-overlay
+            33
$ git log --format=%ci -1
 

-            34
 * Sync failed with 1
-
[FATAL]
-            35
 * Will try to re-create
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            36
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay
+            35
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
 

-            37
*** syncing tatsh-overlay
-

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

-            39
*** synced tatsh-overlay
-

-            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 tatsh-overlay
-

-            44
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad