diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-11 04:46:54 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-09-11 04:46:54 +0000 |
| commit | 68af9998c048e0af25231c3cd4958364dd768e0e (patch) | |
| tree | ada85487c5e524265e682db13e780e83b0904599 /foxiverlay.txt | |
| parent | 2023-09-11T04:30:01Z (diff) | |
| download | repos-68af9998c048e0af25231c3cd4958364dd768e0e.tar.gz repos-68af9998c048e0af25231c3cd4958364dd768e0e.tar.bz2 repos-68af9998c048e0af25231c3cd4958364dd768e0e.zip | |
2023-09-11T04:45:01Z
Diffstat (limited to 'foxiverlay.txt')
| -rw-r--r-- | foxiverlay.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/foxiverlay.txt b/foxiverlay.txt index d9afea79834b..11f79bf02fe8 100644 --- a/foxiverlay.txt +++ b/foxiverlay.txt @@ -13,9 +13,29 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync foxiverlay *** syncing foxiverlay -Already up to date. +From https://github.com/Pekkari/foxiverlay + + f64e22d...55fd504 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 foxiverlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync foxiverlay +*** syncing foxiverlay +Cloning into '/var/lib/repo-mirror-ci/sync/foxiverlay'... *** synced foxiverlay - * 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 foxiverlay |