diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-07 00:48:26 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-07 00:48:26 +0000 |
| commit | aadbe592c0f09470375c5ce6150baf75fe88b4af (patch) | |
| tree | 517e009cc123952905656a73dcd0df89221d1cad /vGist.txt | |
| parent | 2022-06-07T00:30:01Z (diff) | |
| download | repos-aadbe592c0f09470375c5ce6150baf75fe88b4af.tar.gz repos-aadbe592c0f09470375c5ce6150baf75fe88b4af.tar.bz2 repos-aadbe592c0f09470375c5ce6150baf75fe88b4af.zip | |
2022-06-07T00:45:01Z
Diffstat (limited to 'vGist.txt')
| -rw-r--r-- | vGist.txt | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/vGist.txt b/vGist.txt index c02001679922..d4bc6251f768 100644 --- a/vGist.txt +++ b/vGist.txt @@ -11,10 +11,31 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing vGist -Already up to date. +From https://github.com/vgist/vgist-overlay + + b785d87...1b57398 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'... *** synced vGist - * 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 vGist |