diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-18 08:48:13 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-18 08:48:13 +0000 |
| commit | f9a97270f59e9356cff6a5ffe37b833bd8697a7c (patch) | |
| tree | d856e68aeec4260d11b68cb58f21df4686fae93e /nymphos.txt | |
| parent | 2024-02-18T08:30:01Z (diff) | |
| download | repos-f9a97270f59e9356cff6a5ffe37b833bd8697a7c.tar.gz repos-f9a97270f59e9356cff6a5ffe37b833bd8697a7c.tar.bz2 repos-f9a97270f59e9356cff6a5ffe37b833bd8697a7c.zip | |
2024-02-18T08:45:01Z
Diffstat (limited to 'nymphos.txt')
| -rw-r--r-- | nymphos.txt | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/nymphos.txt b/nymphos.txt index 6557fd9aaa23..077e9a961a2e 100644 --- a/nymphos.txt +++ b/nymphos.txt @@ -13,17 +13,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos *** syncing nymphos From https://github.com/neeshy/nymphos - 5a960da..b852dcb master -> origin/master -Updating 5a960da..b852dcb -Fast-forward - media-sound/mpvc/Manifest | 88 +++++++++++++++---------------- - media-sound/mpvc/mpvc-1.4.2.ebuild | 97 ---------------------------------- - media-sound/mpvc/mpvc-1.4.3.ebuild | 103 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 148 insertions(+), 140 deletions(-) - delete mode 100644 media-sound/mpvc/mpvc-1.4.2.ebuild - create mode 100644 media-sound/mpvc/mpvc-1.4.3.ebuild + + b852dcb...e7599d0 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 |