diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-02-13 14:01:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-02-13 14:01:55 +0000 |
| commit | b59df5d6949b639f0530b0f032e479c3e7e6bc7d (patch) | |
| tree | 9aa9895808c2111ed2ecb8288e03c0e799368c3e /AlexandreFournier.txt | |
| parent | 2023-02-13T13:45:01Z (diff) | |
| download | repos-b59df5d6949b639f0530b0f032e479c3e7e6bc7d.tar.gz repos-b59df5d6949b639f0530b0f032e479c3e7e6bc7d.tar.bz2 repos-b59df5d6949b639f0530b0f032e479c3e7e6bc7d.zip | |
2023-02-13T14:00:01Z
Diffstat (limited to 'AlexandreFournier.txt')
| -rw-r--r-- | AlexandreFournier.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/AlexandreFournier.txt b/AlexandreFournier.txt index 754e8c4da320..771eeb72cfe2 100644 --- a/AlexandreFournier.txt +++ b/AlexandreFournier.txt @@ -15,9 +15,29 @@ pkgcore 0.12.17 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync AlexandreFournier *** syncing AlexandreFournier -Already up to date. +From https://github.com/AlexandreFournier/gentoo-overlay + + 6ad7db5...4057b81 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 AlexandreFournier + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync AlexandreFournier +*** syncing AlexandreFournier +Cloning into '/var/lib/repo-mirror-ci/sync/AlexandreFournier'... *** synced AlexandreFournier - * 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 AlexandreFournier |