diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-03-30 08:46:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-03-30 08:46:50 +0000 |
| commit | 9f2add6ca02630f602feaf2e6893cdac652201b1 (patch) | |
| tree | 20aa9300550d0ff2d36e2e0b4ff3137ce424b41c /Systole.txt | |
| parent | 2023-03-30T08:30:01Z (diff) | |
| download | repos-9f2add6ca02630f602feaf2e6893cdac652201b1.tar.gz repos-9f2add6ca02630f602feaf2e6893cdac652201b1.tar.bz2 repos-9f2add6ca02630f602feaf2e6893cdac652201b1.zip | |
2023-03-30T08:45:01Z
Diffstat (limited to 'Systole.txt')
| -rw-r--r-- | Systole.txt | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/Systole.txt b/Systole.txt index 239a3eed50af..c99de4413609 100644 --- a/Systole.txt +++ b/Systole.txt @@ -15,16 +15,28 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole *** syncing Systole From https://github.com/SystoleOS/gentoo-overlay - 11f4486..b4db93f master -> origin/master -Updating 11f4486..b4db93f -Fast-forward - Slicer-Extension/SlicerOpenIGTLink/Manifest | 2 +- - Slicer-Extension/SlicerOpenIGTLink/SlicerOpenIGTLink-9999.ebuild | 2 +- - Slicer-Loadable/Markups/Manifest | 2 +- - Slicer-Loadable/Markups/Markups-9999.ebuild | 9 +++++---- - 4 files changed, 8 insertions(+), 7 deletions(-) + + b4db93f...03c8bd9 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 Systole + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Systole +*** syncing Systole +Cloning into '/var/lib/repo-mirror-ci/sync/Systole'... *** synced Systole - * 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 Systole |