diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-11-23 07:16:43 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-11-23 07:16:43 +0000 |
| commit | 8f4ce5344495e4640773e20adb8445daec23daab (patch) | |
| tree | dfd8c02e23b243948c8072ca3b46bec18e134358 /vGist.txt | |
| parent | 2023-11-23T07:00:01Z (diff) | |
| download | repos-8f4ce5344495e4640773e20adb8445daec23daab.tar.gz repos-8f4ce5344495e4640773e20adb8445daec23daab.tar.bz2 repos-8f4ce5344495e4640773e20adb8445daec23daab.zip | |
2023-11-23T07:15:01Z
Diffstat (limited to 'vGist.txt')
| -rw-r--r-- | vGist.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/vGist.txt b/vGist.txt index fa82ca2dda5f..57416b8a9692 100644 --- a/vGist.txt +++ b/vGist.txt @@ -12,29 +12,9 @@ pkgcore 0.12.23 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist *** syncing vGist -From https://github.com/vgist/vgist-overlay - + e28e8b7...c929e56 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 vGist - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist -*** syncing vGist -Cloning into '/var/lib/repo-mirror-ci/sync/vGist'... +Already up to date. *** synced vGist - * Sync succeeded after re-adding + * Sync succeeded $ 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 vGist |