diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-22 09:48:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-22 09:48:23 +0000 |
| commit | 254eebce30eb78c09d3c356afac3a3109c6c46db (patch) | |
| tree | e333b1f58ac83fca75c2627f9ea0f198b1eea762 /SwordArMor.txt | |
| parent | 2024-10-22T09:30:01Z (diff) | |
| download | repos-254eebce30eb78c09d3c356afac3a3109c6c46db.tar.gz repos-254eebce30eb78c09d3c356afac3a3109c6c46db.tar.bz2 repos-254eebce30eb78c09d3c356afac3a3109c6c46db.zip | |
2024-10-22T09:45:00Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index 868b1589df5b..7a4e458832ce 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -15,17 +15,28 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor *** syncing SwordArMor From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay - bc503e8..7f31713 master -> origin/master -Updating bc503e8..7f31713 -Fast-forward - games-server/factorio-server/Manifest | 1 + - .../factorio-server/factorio-server-2.0.8.ebuild | 42 ++++++++++++++++++++++ - .../md5-cache/games-server/factorio-server-2.0.8 | 11 ++++++ - 3 files changed, 54 insertions(+) - create mode 100644 games-server/factorio-server/factorio-server-2.0.8.ebuild - create mode 100644 metadata/md5-cache/games-server/factorio-server-2.0.8 + + 7f31713...1045f08 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 SwordArMor + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor +*** syncing SwordArMor +Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... *** synced SwordArMor - * 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 SwordArMor |