diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-11 04:50:23 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-11 04:50:23 +0000 |
| commit | 7e7a6a8fc49cfd8d54ca5eaab0ae4d1238dc160c (patch) | |
| tree | b923d07d95725a518940979711062528896972a9 /SwordArMor.txt | |
| parent | 2021-04-11T04:30:01Z (diff) | |
| download | repos-7e7a6a8fc49cfd8d54ca5eaab0ae4d1238dc160c.tar.gz repos-7e7a6a8fc49cfd8d54ca5eaab0ae4d1238dc160c.tar.bz2 repos-7e7a6a8fc49cfd8d54ca5eaab0ae4d1238dc160c.zip | |
2021-04-11T04:45:01Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index b68e604dbd91..94df734afe2d 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -10,12 +10,30 @@ {'type': 'git', 'uri': 'git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository +$ pmaint sync SwordArMor +*** syncing SwordArMor +warning: Pulling without specifying how to reconcile divergent branches is +discouraged. You can squelch this message by running one of the following +commands sometime before your next pull: + + git config pull.rebase false # merge (the default strategy) + git config pull.rebase true # rebase + git config pull.ff only # fast-forward only + +You can replace "git config" with "git config --global" to set a default +preference for all repositories. You can also pass --rebase, --no-rebase, +or --ff-only on the command line to override the configured default per +invocation. + +fatal: unable to access 'https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/': The requested URL returned error: 500 +!!! failed syncing SwordArMor + * Sync failed with 1 + * Will try to re-create $ pmaint 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 regen --use-local-desc --pkg-desc-index -t 32 SwordArMor |