diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-21 09:46:27 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-08-21 09:46:27 +0000 |
| commit | c95f5f72bac3ef89a7931ca061b78f287e270125 (patch) | |
| tree | 0ae6e08598ceec109db13273c9c8abad81660b06 /nymphos.txt | |
| parent | 2023-08-21T09:30:01Z (diff) | |
| download | repos-c95f5f72bac3ef89a7931ca061b78f287e270125.tar.gz repos-c95f5f72bac3ef89a7931ca061b78f287e270125.tar.bz2 repos-c95f5f72bac3ef89a7931ca061b78f287e270125.zip | |
2023-08-21T09:45:01Z
Diffstat (limited to 'nymphos.txt')
| -rw-r--r-- | nymphos.txt | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/nymphos.txt b/nymphos.txt index 61ca55da59b0..bd84b1ffaaef 100644 --- a/nymphos.txt +++ b/nymphos.txt @@ -13,15 +13,28 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos *** syncing nymphos From https://github.com/neeshy/nymphos - db9a5b8..a855636 master -> origin/master -Updating db9a5b8..a855636 -Fast-forward - media-sound/mpvc/Manifest | 41 +++++++++------------- - .../mpvc/{mpvc-1.3.1.ebuild => mpvc-1.4.0.ebuild} | 39 ++++++++------------ - 2 files changed, 31 insertions(+), 49 deletions(-) - rename media-sound/mpvc/{mpvc-1.3.1.ebuild => mpvc-1.4.0.ebuild} (70%) + + a855636...77a6b69 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 |