diff options
author | 2024-08-17 19:18:43 +0000 | |
---|---|---|
committer | 2024-08-17 19:18:43 +0000 | |
commit | 047002b330144e34680b59d665aa6d2d1dea763c (patch) | |
tree | 8ed9858b3ba782cfd8859e313c2eb24706b4c151 /lanodanOverlay.txt | |
parent | 2024-08-17T19:00:00Z (diff) | |
download | repos-047002b330144e34680b59d665aa6d2d1dea763c.tar.gz repos-047002b330144e34680b59d665aa6d2d1dea763c.tar.bz2 repos-047002b330144e34680b59d665aa6d2d1dea763c.zip |
2024-08-17T19:15:00Z
Diffstat (limited to 'lanodanOverlay.txt')
-rw-r--r-- | lanodanOverlay.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index 32d6d05bb8a8..7db56b3170f5 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -13,29 +13,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay *** syncing lanodanOverlay -From https://hacktivis.me/git/overlay - + c7b1c08...17d59c9 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 lanodanOverlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay -*** syncing lanodanOverlay -Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'... +Already up to date. *** synced lanodanOverlay - * 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 lanodanOverlay |