diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:38:02 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-18 18:38:02 +0000 |
| commit | 124ab3295c1a2c0f539a69c07bce7b281ac0d957 (patch) | |
| tree | 2c198428b265a6412edfc3a6c12852ec0f7a3ab6 /SwordArMor.txt | |
| parent | 2024-09-18T18:00:00Z (diff) | |
| download | repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.tar.gz repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.tar.bz2 repos-124ab3295c1a2c0f539a69c07bce7b281ac0d957.zip | |
2024-09-18T18:30:00Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index 5790ae97d33a..9cf041a1f848 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -15,28 +15,18 @@ pkgcore 0.12.27 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor *** syncing SwordArMor From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay - + 8e7694a...553a1bf 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'... + 553a1bf..8c69a4a master -> origin/master +Updating 553a1bf..8c69a4a +Fast-forward + metadata/md5-cache/net-im/mautrix-signal-0.7.0 | 2 +- + .../net-im/{mautrix-signal-0.6.3 => mautrix-signal-0.7.1} | 8 ++++---- + net-im/mautrix-signal/Manifest | 4 ++-- + .../{mautrix-signal-0.6.3.ebuild => mautrix-signal-0.7.1.ebuild} | 9 +++------ + 4 files changed, 10 insertions(+), 13 deletions(-) + rename metadata/md5-cache/net-im/{mautrix-signal-0.6.3 => mautrix-signal-0.7.1} (56%) + rename net-im/mautrix-signal/{mautrix-signal-0.6.3.ebuild => mautrix-signal-0.7.1.ebuild} (88%) *** synced SwordArMor - * Sync succeeded after re-adding + * Sync succeeded $ 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 |