summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2024-02-21 07:48:07 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2024-02-21 07:48:07 +0000
commit885a503dc5ef192a773dd3d72cb91c11ec64c4e7 (patch)
treee189f0071006fe3b427bb72b620d3e62c2a48247 /gig.txt
parent2024-02-21T07:30:00Z (diff)
downloadrepos-885a503dc5ef192a773dd3d72cb91c11ec64c4e7.tar.gz
repos-885a503dc5ef192a773dd3d72cb91c11ec64c4e7.tar.bz2
repos-885a503dc5ef192a773dd3d72cb91c11ec64c4e7.zip
2024-02-21T07:45:00Z
Diffstat (limited to 'gig.txt')
-rw-r--r--gig.txt24
1 files changed, 22 insertions, 2 deletions
diff --git a/gig.txt b/gig.txt
index 1871bb144bc5..edad54c0d058 100644
--- a/gig.txt
+++ b/gig.txt
@@ -11,9 +11,29 @@ pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gig
*** syncing gig
-Already up to date.
+From https://github.com/Gig-OS/gig
+ + d4831df...77e5a2c master -> origin/master (forced update)
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint:
+hint: git config pull.rebase false # merge
+hint: git config pull.rebase true # rebase
+hint: git config pull.ff only # fast-forward only
+hint:
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+fatal: Need to specify how to reconcile divergent branches.
+!!! failed syncing gig
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gig
+*** syncing gig
+Cloning into '/var/lib/repo-mirror-ci/sync/gig'...
*** synced gig
- * Sync succeeded
+ * Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gig