From 3d3130bc896cdc4a4a84a3c19e0338cf138ead02 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 8 Jun 2022 14:02:52 +0000 Subject: 2022-06-08T14:00:01Z --- vGist.html | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'vGist.html') diff --git a/vGist.html b/vGist.html index 02d4cacba39e..f8ab2dcc6597 100644 --- a/vGist.html +++ b/vGist.html @@ -38,19 +38,59 @@ 14
*** syncing vGist
- 15
Already up to date.
+            15
From https://github.com/vgist/vgist-overlay
 

-            16
*** synced vGist
+            16
 + 1e2ec77...590b7db master     -> origin/master  (forced update)
 

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

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

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

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

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

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

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

+            24
hint: 
+

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

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

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

+            28
hint: invocation.
+

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

+            30
!!! failed syncing vGist
+

+            31
 * Sync failed with 1
+
[FATAL]
+            32
 * Will try to re-create
+

+            33
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
+

+            34
*** syncing vGist
+

+            35
Cloning into '/var/lib/repo-mirror-ci/sync/vGist'...
+

+            36
*** synced vGist
+

+            37
 * Sync succeeded after re-adding
+

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

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

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

+            41
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad