From 8539b0a368e83684ae833d076b1815cdac1d22af Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 22 Apr 2024 09:48:23 +0000 Subject: 2024-04-22T09:45:00Z --- tatsh-overlay.html | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'tatsh-overlay.html') diff --git a/tatsh-overlay.html b/tatsh-overlay.html index 153208a0c5cb..77fc642dd755 100644 --- a/tatsh-overlay.html +++ b/tatsh-overlay.html @@ -46,37 +46,57 @@ 18
From https://github.com/Tatsh/tatsh-overlay
- 19
   b01baff4..63d3f032  master     -> origin/master
+            19
 + 63d3f032...bfd2e043 master     -> origin/master  (forced update)
 

-            20
Updating b01baff4..63d3f032
+            20
hint: You have divergent branches and need to specify how to reconcile them.
 

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

-            22
 net-misc/phantomjs-bin/Manifest                   |  3 ++
+            22
hint: your next pull:
 

-            23
 net-misc/phantomjs-bin/metadata.xml               | 11 +++++++
+            23
hint: 
 

-            24
 net-misc/phantomjs-bin/phantomjs-bin-2.1.1.ebuild | 38 +++++++++++++++++++++++
+            24
hint:   git config pull.rebase false  # merge
 

-            25
 3 files changed, 52 insertions(+)
+            25
hint:   git config pull.rebase true   # rebase
 

-            26
 create mode 100644 net-misc/phantomjs-bin/Manifest
+            26
hint:   git config pull.ff only       # fast-forward only
 

-            27
 create mode 100644 net-misc/phantomjs-bin/metadata.xml
+            27
hint: 
 

-            28
 create mode 100644 net-misc/phantomjs-bin/phantomjs-bin-2.1.1.ebuild
+            28
hint: You can replace "git config" with "git config --global" to set a default
 

-            29
*** synced tatsh-overlay
+            29
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

-            31
$ git log --format=%ci -1
+            31
hint: invocation.
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
fatal: Need to specify how to reconcile divergent branches.
 

-            33
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
+            33
!!! failed syncing tatsh-overlay
 

-            34
 * Cache regenerated successfully
+            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 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
 

 
         
-- 
cgit v1.2.3-65-gdbad