diff options
Diffstat (limited to 'nymphos.txt')
| -rw-r--r-- | nymphos.txt | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/nymphos.txt b/nymphos.txt index 8f30c6e3a4ee..f4d5929a3ff9 100644 --- a/nymphos.txt +++ b/nymphos.txt @@ -11,28 +11,30 @@ pkgcore 0.12.17 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos -WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing nymphos From https://github.com/neeshy/nymphos - eb18dd2..6c238cf master -> origin/master -Updating eb18dd2..6c238cf -Fast-forward - app-misc/lf/Manifest | 53 +++++++++++++++------- - app-misc/lf/{lf-27.ebuild => lf-28.ebuild} | 0 - app-misc/lf/lf-9999.ebuild | 51 ++++++++++++++------- - games-arcade/osu-lazer/Manifest | 2 +- - .../osu-lazer/osu-lazer-2022.1208.0.ebuild | 1 - - net-misc/pipe-viewer/Manifest | 2 +- - ...iewer-0.4.3.ebuild => pipe-viewer-0.4.4.ebuild} | 0 - sys-fs/mdevd/Manifest | 2 +- - .../{mdevd-0.1.6.0.ebuild => mdevd-0.1.6.1.ebuild} | 0 - 9 files changed, 74 insertions(+), 37 deletions(-) - rename app-misc/lf/{lf-27.ebuild => lf-28.ebuild} (100%) - delete mode 120000 games-arcade/osu-lazer/osu-lazer-2022.1208.0.ebuild - rename net-misc/pipe-viewer/{pipe-viewer-0.4.3.ebuild => pipe-viewer-0.4.4.ebuild} (100%) - rename sys-fs/mdevd/{mdevd-0.1.6.0.ebuild => mdevd-0.1.6.1.ebuild} (100%) + + 6c238cf...f1d3789 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 nymphos + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos +*** syncing nymphos +Cloning into '/var/lib/repo-mirror-ci/sync/nymphos'... *** synced nymphos - * 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 nymphos |