diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-09 22:48:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-06-09 22:48:50 +0000 |
| commit | 6db072f5053f313957d4a522375bfccea97eb503 (patch) | |
| tree | 05395baa94dc48e4313cf0ad839b0c2c3d207a73 /Case_Of.txt | |
| parent | 2024-06-09T22:30:00Z (diff) | |
| download | repos-6db072f5053f313957d4a522375bfccea97eb503.tar.gz repos-6db072f5053f313957d4a522375bfccea97eb503.tar.bz2 repos-6db072f5053f313957d4a522375bfccea97eb503.zip | |
2024-06-09T22:45:00Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index 2ba80cb7e623..f05007b09743 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -15,22 +15,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of *** syncing Case_Of From https://codeberg.org/Case_Of/gentoo-overlay - 393bb6b..6f13e7c master -> origin/master -Updating 393bb6b..6f13e7c -Fast-forward - dev-python/httptools/Manifest | 3 -- - .../httptools/files/httptools-0.6.1-cython3.patch | 13 ++++++++ - dev-python/httptools/httptools-0.5.0.ebuild | 37 --------------------- - dev-python/httptools/httptools-0.6.0.ebuild | 38 ---------------------- - dev-python/httptools/httptools-0.6.1.ebuild | 19 +++++++---- - profiles/package.mask | 2 -- - 6 files changed, 26 insertions(+), 86 deletions(-) - create mode 100644 dev-python/httptools/files/httptools-0.6.1-cython3.patch - delete mode 100644 dev-python/httptools/httptools-0.5.0.ebuild - delete mode 100644 dev-python/httptools/httptools-0.6.0.ebuild - delete mode 100644 profiles/package.mask + + 6f13e7c...4425543 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 Case_Of + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of +*** syncing Case_Of +Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... *** synced Case_Of - * 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 Case_Of |